History

kconfig: qconf: remove qInfo() to get back Qt4 support

qconf is supposed to work with Qt4 and Qt5, but since commit c4f7398bee9c ("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.

Masahiro Yamada committed 6 years ago

Commit 53efe2e1 parent 66c262b1 file · +0 −2Browse files

Unified · Split

scripts/kconfig/qconf.cc+0−2
@@ -1238,7 +1238,6 @@ void ConfigInfoView::clicked(const QUrl &url) · 1237 unmodified lines
1238 struct menu *m = NULL;1238 struct menu *m = NULL;
1239 1239
1240 if (count < 1) {1240 if (count < 1) {
1241 qInfo() << "Clicked link is empty";
1242 delete[] data;1241 delete[] data;
1243 return;1242 return;
1244 }1243 }
@@ -1251,7 +1250,6 @@ void ConfigInfoView::clicked(const QUrl &url) · 6 unmodified lines
1251 strcat(data, "$");1250 strcat(data, "$");
1252 result = sym_re_search(data);1251 result = sym_re_search(data);
1253 if (!result) {1252 if (!result) {
1254 qInfo() << "Clicked symbol is invalid:" << data;
1255 delete[] data;1253 delete[] data;
1256 return;1254 return;
1257 }1255 }