diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-11-11 13:51:47 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-11-12 13:16:18 +0000 |
| commit | 80be8c2b142febf01a5e5c4449f2e8f919a4845a (patch) | |
| tree | e852b5bd1e281a19627f6a360f6eff55dbf874ee | |
| parent | 2b414508b7bd1111023a1d389681c016841132fd (diff) | |
QtSupport: Prefer suffixed uic
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>
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 894f79d40a..331e30f9dd 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -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: |