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

QtSupport: Prefer suffixed uic

Browse Source 
This prevents the wrong uic from getting picked up in the case where the
unsuffixed version belongs to a different Qt.

Change-Id: I3fe7b4afc25a2733c632bb0195ca7ea74666bdbf
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2020-11-11 13:51:47 +01:00
parent 2b414508b7
commit 80be8c2b14
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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