Skip to content

Commit 53efe2e

Browse files
committed
kconfig: qconf: remove qInfo() to get back Qt4 support
qconf is supposed to work with Qt4 and Qt5, but since commit c4f7398 ("kconfig: qconf: make debug links work again"), building with Qt4 fails as follows: HOSTCXX scripts/kconfig/qconf.o scripts/kconfig/qconf.cc: In member function ‘void ConfigInfoView::clicked(const QUrl&)’: scripts/kconfig/qconf.cc:1241:3: error: ‘qInfo’ was not declared in this scope; did you mean ‘setInfo’? 1241 | qInfo() << "Clicked link is empty"; | ^~~~~ | setInfo scripts/kconfig/qconf.cc:1254:3: error: ‘qInfo’ was not declared in this scope; did you mean ‘setInfo’? 1254 | qInfo() << "Clicked symbol is invalid:" << data; | ^~~~~ | setInfo make[1]: *** [scripts/Makefile.host:129: scripts/kconfig/qconf.o] Error 1 make: *** [Makefile:606: xconfig] Error 2 qInfo() does not exist in Qt4. In my understanding, these call-sites should be unreachable. Perhaps, qWarning(), assertion, or something is better, but qInfo() is not the right one to use here, I think. Fixes: c4f7398 ("kconfig: qconf: make debug links work again") Reported-by: Ronald Warsow <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 66c262b commit 53efe2e

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

scripts/kconfig/qconf.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,6 @@ void ConfigInfoView::clicked(const QUrl &url)
12381238
struct menu *m = NULL;
12391239

12401240
if (count < 1) {
1241-
qInfo() << "Clicked link is empty";
12421241
delete[] data;
12431242
return;
12441243
}
@@ -1251,7 +1250,6 @@ void ConfigInfoView::clicked(const QUrl &url)
12511250
strcat(data, "$");
12521251
result = sym_re_search(data);
12531252
if (!result) {
1254-
qInfo() << "Clicked symbol is invalid:" << data;
12551253
delete[] data;
12561254
return;
12571255
}

0 commit comments

Comments
 (0)