From 6c37cd53beff49ed3a9ae9a8bd253dd5afe63eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Thu, 18 Mar 2021 16:39:56 +0100 Subject: [PATCH] Fix location of qmlscene, qmlplugindump tools for Qt 6 Do not try to locate qmlscene and qmlplugindump via parsing mkspecs anymore. Instead, expect the binaries to be installed in QT_INSTALL_BINS. Change-Id: Ifc194ce3e40dbeca26cf3abd327cf5f633d6a6ba Reviewed-by: Joerg Bornemann --- src/plugins/qtsupport/baseqtversion.cpp | 20 +++----------------- src/plugins/qtsupport/baseqtversion.h | 1 - 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index edac4e570d8..25c1598ef0e 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -639,12 +639,6 @@ FilePath BaseQtVersion::mkspecsPath() const return result.pathAppended("mkspecs"); } -FilePath BaseQtVersion::qmlBinPath() const -{ - d->updateVersionInfo(); - return FilePath::fromUserInput(d->m_mkspecValues.value("QT.qml.bins")); -} - FilePath BaseQtVersion::librarySearchPath() const { return HostOsInfo::isWindowsHost() ? binPath() : libraryPath(); @@ -1000,10 +994,8 @@ QString BaseQtVersion::qmlsceneCommand() const if (!d->m_qmlsceneCommand.isNull()) return d->m_qmlsceneCommand; - ensureMkSpecParsed(); - - const QString path = - qmlBinPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlscene")).toString(); + const QString path + = binPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlscene")).toString(); d->m_qmlsceneCommand = QFileInfo(path).isFile() ? path : QString(); @@ -1018,10 +1010,8 @@ QString BaseQtVersion::qmlplugindumpCommand() const if (!d->m_qmlplugindumpCommand.isNull()) return d->m_qmlplugindumpCommand; - ensureMkSpecParsed(); - const QString path - = qmlBinPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlplugindump")).toString(); + = binPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlplugindump")).toString(); d->m_qmlplugindumpCommand = QFileInfo(path).isFile() ? path : QString(); @@ -1183,12 +1173,8 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const else if (value == "qt_framework") d->m_frameworkBuild = true; } - 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(qmlBins, evaluator->value(qmlBins)); - d->m_mkspecValues.insert(declarativeBins, evaluator->value(declarativeBins)); d->m_mkspecValues.insert(libinfix, evaluator->value(libinfix)); d->m_mkspecValues.insert(ns, evaluator->value(ns)); } diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index bebaf654ac9..2d140698954 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -213,7 +213,6 @@ public: Utils::FilePath hostPrefixPath() const; Utils::FilePath mkspecsPath() const; - Utils::FilePath qmlBinPath() const; Utils::FilePath librarySearchPath() const; Utils::FilePaths directoriesToIgnoreInProjectTree() const;