From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sat, 29 Aug 2020 08:14:17 +0000 (+0900)
Subject: kconfig: qconf: create QApplication after option checks
X-Git-Tag: v5.10-rc1~50^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9a825a7f65a1c94858667934c4ed59bc548dd1f;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 21871b7f5f8a4..f7eb093614f27 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();