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

Fix location of qmlscene, qmlplugindump tools for Qt 6

Browse Source 
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 <joerg.bornemann@qt.io>
This commit is contained in:
Kai Köhne
2021-03-18 16:39:56 +01:00
committed by Kai Koehne
parent c9053256d3
commit 6c37cd53be
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -639,12 +639,6 @@ FilePath BaseQtVersion::mkspecsPath() const
return result.pathAppended("mkspecs"); return result.pathAppended("mkspecs");
} }
FilePath BaseQtVersion::qmlBinPath() const
{
d->updateVersionInfo();
return FilePath::fromUserInput(d->m_mkspecValues.value("QT.qml.bins"));
}
FilePath BaseQtVersion::librarySearchPath() const FilePath BaseQtVersion::librarySearchPath() const
{ {
return HostOsInfo::isWindowsHost() ? binPath() : libraryPath(); return HostOsInfo::isWindowsHost() ? binPath() : libraryPath();
@@ -1000,10 +994,8 @@ QString BaseQtVersion::qmlsceneCommand() const
if (!d->m_qmlsceneCommand.isNull()) if (!d->m_qmlsceneCommand.isNull())
return d->m_qmlsceneCommand; return d->m_qmlsceneCommand;
ensureMkSpecParsed(); const QString path
= binPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlscene")).toString();
const QString path =
qmlBinPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlscene")).toString();
d->m_qmlsceneCommand = QFileInfo(path).isFile() ? path : QString(); d->m_qmlsceneCommand = QFileInfo(path).isFile() ? path : QString();
@@ -1018,10 +1010,8 @@ QString BaseQtVersion::qmlplugindumpCommand() const
if (!d->m_qmlplugindumpCommand.isNull()) if (!d->m_qmlplugindumpCommand.isNull())
return d->m_qmlplugindumpCommand; return d->m_qmlplugindumpCommand;
ensureMkSpecParsed();
const QString path const QString path
= qmlBinPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlplugindump")).toString(); = binPath().pathAppended(HostOsInfo::withExecutableSuffix("qmlplugindump")).toString();
d->m_qmlplugindumpCommand = QFileInfo(path).isFile() ? path : QString(); d->m_qmlplugindumpCommand = QFileInfo(path).isFile() ? path : QString();
@@ -1183,12 +1173,8 @@ 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 qmlBins = "QT.qml.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(qmlBins, evaluator->value(qmlBins));
d->m_mkspecValues.insert(declarativeBins, evaluator->value(declarativeBins));
d->m_mkspecValues.insert(libinfix, evaluator->value(libinfix)); d->m_mkspecValues.insert(libinfix, evaluator->value(libinfix));
d->m_mkspecValues.insert(ns, evaluator->value(ns)); d->m_mkspecValues.insert(ns, evaluator->value(ns));
} }

1
src/plugins/qtsupport/baseqtversion.h
View File

@@ -213,7 +213,6 @@ public:
Utils::FilePath hostPrefixPath() const; Utils::FilePath hostPrefixPath() const;
Utils::FilePath mkspecsPath() const; Utils::FilePath mkspecsPath() const;
Utils::FilePath qmlBinPath() const;
Utils::FilePath librarySearchPath() const; Utils::FilePath librarySearchPath() const;
Utils::FilePaths directoriesToIgnoreInProjectTree() const; Utils::FilePaths directoriesToIgnoreInProjectTree() const;