Synchronise with v4.1

[kconfig-frontends] / frontends / qconf / qconf.cc

diff --git a/frontends/qconf/qconf.cc b/frontends/qconf/qconf.cc
index 65eeeb44e86c48a1bfa1fc9ed54bb22565301e0a..de9a1e843c14b73ea1212970cb01a4fcf2241431 100644 (file)
--- a/frontends/qconf/qconf.cc
+++ b/frontends/qconf/qconf.cc
@@ -1746,7 +1746,7 @@ static const char *progname;
 
 static void usage(void)
 {
-       printf(_("%s <config>\n"), progname);
+       printf(_("%s [-s] <config>\n"), progname);
        exit(0);
 }
 
@@ -1762,6 +1762,9 @@ int main(int ac, char** av)
        configApp = new QApplication(ac, av);
        if (ac > 1 && av[1][0] == '-') {
                switch (av[1][1]) {
+               case 's':
+                       conf_set_message_callback(NULL);
+                       break;
                case 'h':
                case '?':
                        usage();