From 8d3563748a357f97fd2d75febcb8e50a0bcff5f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 10 Mar 2021 09:29:27 +0100 Subject: [PATCH] Make sure designer, linguist are also found in Qt 6 cross-builds 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 --- src/plugins/qtsupport/baseqtversion.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index dd316d64312..d8002505628 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1016,12 +1016,9 @@ QString BaseQtVersionPrivate::findHostBinary(HostBinaries binary) const if (q->qtVersion() < QtVersionNumber(5, 0, 0)) { baseDir = q->binPath().toString(); } else { - q->ensureMkSpecParsed(); switch (binary) { case Designer: case Linguist: - baseDir = m_mkspecValues.value("QT.designer.bins"); - break; case Rcc: case Uic: case QScxmlc: @@ -1168,12 +1165,10 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const else if (value == "qt_framework") d->m_frameworkBuild = true; } - const QString designerBins = "QT.designer.bins"; const QString qmlBins = "QT.qml.bins"; const QString declarativeBins = "QT.declarative.bins"; const QString libinfix = MKSPEC_VALUE_LIBINFIX; 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(declarativeBins, evaluator->value(declarativeBins)); d->m_mkspecValues.insert(libinfix, evaluator->value(libinfix));