summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-08-29 17:14:17 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2020-09-25 00:37:13 +0900
commitf9a825a7f65a1c94858667934c4ed59bc548dd1f (patch)
tree36862823878d83890f42652ef43569d7486b285d /scripts
parenta0fce283386d76f3e77f4f45b7ec6f0084510baa (diff)
downloadlinux-stable-f9a825a7f65a1c94858667934c4ed59bc548dd1f.tar.gz
linux-stable-f9a825a7f65a1c94858667934c4ed59bc548dd1f.tar.bz2
linux-stable-f9a825a7f65a1c94858667934c4ed59bc548dd1f.zip
kconfig: qconf: create QApplication after option checks
'scripts/kconfig/qconf -h' just calls usage() and exits, with QApplication unused. There is no need to construct QApplication so early. Do it after the parse stage. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Tested-by: Randy Dunlap <rdunlap@infradead.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/qconf.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 21871b7f5f8a..f7eb093614f2 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1851,7 +1851,6 @@ int main(int ac, char** av)
const char *name;
progname = av[0];
- configApp = new QApplication(ac, av);
if (ac > 1 && av[1][0] == '-') {
switch (av[1][1]) {
case 's':
@@ -1872,6 +1871,8 @@ int main(int ac, char** av)
conf_read(NULL);
//zconfdump(stdout);
+ configApp = new QApplication(ac, av);
+
configSettings = new ConfigSettings();
configSettings->beginGroup("/kconfig/qconf");
v = new ConfigMainWindow();