feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: Do not prefer Qt4's uic unconditionally

Browse Source 
A Linux distribution with Qt4 and Qt5 installed will typically have uic
and uic-qt4 present in the same directory. Our code always preferred
uic-qt4, even for Qt5, leading to potentially invalid code in the
generated ui header file.

Fixes: QTCREATORBUG-17739
Change-Id: Icf509de4e2fbee1d51fd049a8cf5a27d1ac5190b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-10 12:53:22 +01:00
parent d1d95e78d6
commit f7399d520e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -1054,7 +1054,9 @@ QString BaseQtVersionPrivate::findHostBinary(HostBinaries binary) const
if (HostOsInfo::isWindowsHost()) {
possibleCommands << "uic.exe";
} else {
possibleCommands << "uic-qt4" << "uic4" << "uic";
possibleCommands << "uic";
if (q->qtVersion().majorVersion == 4)
possibleCommands << "uic-qt4" << "uic4";
}
break;
case QScxmlc: