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

QmlProjectManager: use qml2puppet only if it is QtSudio Qt

Browse Source 
Task-number: QTCREATORBUG-29259
Change-Id: Ib05737368c224fa28b2c9f091dfa0e210bc838af
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2023-06-15 14:36:52 +02:00
parent 22c72f9999
commit 053e970c4d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -217,7 +217,10 @@ FilePath QmlProjectRunConfiguration::qmlRuntimeFilePath() const
// i.e. not necessarily something the device can use, but the // i.e. not necessarily something the device can use, but the
// device had its chance above. // device had its chance above.
if (QtVersion *version = QtKitAspect::qtVersion(kit)) { if (QtVersion *version = QtKitAspect::qtVersion(kit)) {
if (version->qtVersion().majorVersion() > 5) { // look for puppet as qmlruntime only in QtStudio Qt versions
if (version->features().contains("QtStudio") &&
version->qtVersion().majorVersion() > 5) {
auto [workingDirectoryPath, puppetPath] = QmlDesigner::QmlPuppetPaths::qmlPuppetPaths( auto [workingDirectoryPath, puppetPath] = QmlDesigner::QmlPuppetPaths::qmlPuppetPaths(
target(), QmlDesigner::QmlDesignerBasePlugin::settings()); target(), QmlDesigner::QmlDesignerBasePlugin::settings());
if (!puppetPath.isEmpty()) { if (!puppetPath.isEmpty()) {