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

Adapt locations of rcc and uic for Qt 6.1

Browse Source 
They are now found in libexec, not bin.

Task-number: QTBUG-88791
Change-Id: I34a13034833117f2360fdbbf41c54bbf2cfb55da
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Kai Köhne
2021-03-10 11:22:43 +01:00
committed by Kai Koehne
parent a8d9fb0e6e
commit aaa3fda1ad
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1040,11 +1040,16 @@ QString BaseQtVersionPrivate::findHostBinary(HostBinaries binary) const
switch (binary) { switch (binary) {
case Designer: case Designer:
case Linguist: case Linguist:
case Rcc:
case Uic:
case QScxmlc: case QScxmlc:
baseDir = q->hostBinPath().toString(); baseDir = q->hostBinPath().toString();
break; break;
case Rcc:
case Uic:
if (q->qtVersion() >= QtVersionNumber(6, 1))
baseDir = q->hostLibexecPath().toString();
else
baseDir = q->hostBinPath().toString();
break;
default: default:
// Can't happen // Can't happen
Q_ASSERT(false); Q_ASSERT(false);