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

Make sure designer, linguist are also found in Qt 6 cross-builds

Browse Source 
Do not try to locate designer and linguist via parsing mkspecs
anymore, since this won't work in a Qt 6 cross-build.

Instead, expect the binaries to be installed in QT_HOST_BINS.

Change-Id: Iab799770306e03e29f5f7afd2f92e824e66af25b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Kai Köhne
2021-03-10 09:29:27 +01:00
committed by Kai Koehne
parent a76a3b38e8
commit 8d3563748a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1016,12 +1016,9 @@ QString BaseQtVersionPrivate::findHostBinary(HostBinaries binary) const
if (q->qtVersion() < QtVersionNumber(5, 0, 0)) { if (q->qtVersion() < QtVersionNumber(5, 0, 0)) {
baseDir = q->binPath().toString(); baseDir = q->binPath().toString();
} else { } else {
q->ensureMkSpecParsed();
switch (binary) { switch (binary) {
case Designer: case Designer:
case Linguist: case Linguist:
baseDir = m_mkspecValues.value("QT.designer.bins");
break;
case Rcc: case Rcc:
case Uic: case Uic:
case QScxmlc: case QScxmlc:
@@ -1168,12 +1165,10 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
else if (value == "qt_framework") else if (value == "qt_framework")
d->m_frameworkBuild = true; d->m_frameworkBuild = true;
} }
const QString designerBins = "QT.designer.bins";
const QString qmlBins = "QT.qml.bins"; const QString qmlBins = "QT.qml.bins";
const QString declarativeBins = "QT.declarative.bins"; const QString declarativeBins = "QT.declarative.bins";
const QString libinfix = MKSPEC_VALUE_LIBINFIX; const QString libinfix = MKSPEC_VALUE_LIBINFIX;
const QString ns = MKSPEC_VALUE_NAMESPACE; const QString ns = MKSPEC_VALUE_NAMESPACE;
d->m_mkspecValues.insert(designerBins, evaluator->value(designerBins));
d->m_mkspecValues.insert(qmlBins, evaluator->value(qmlBins)); d->m_mkspecValues.insert(qmlBins, evaluator->value(qmlBins));
d->m_mkspecValues.insert(declarativeBins, evaluator->value(declarativeBins)); d->m_mkspecValues.insert(declarativeBins, evaluator->value(declarativeBins));
d->m_mkspecValues.insert(libinfix, evaluator->value(libinfix)); d->m_mkspecValues.insert(libinfix, evaluator->value(libinfix));