summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Hartmann <thomas.hartmann@qt.io>2022-11-30 20:14:57 +0100
committerThomas Hartmann <thomas.hartmann@qt.io>2022-11-30 20:11:53 +0000
commitb9e7fd2415897b9a17039e747a053e088d22c75f (patch)
treecfc06b36c194530c13c074c3bc61d88d48d9abbf
parent072bdb22fc5b3e9c0f61d84175930a361f1cf8fd (diff)
downloadqt-creator-b9e7fd2415897b9a17039e747a053e088d22c75f.tar.gz
QmlDesigner: Take puppet version into account
Change-Id: I8bd6f588dcf00e20dbcddde9caee8eef3eafc3b0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/plugins/qmldesigner/puppetenvironmentbuilder.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
index 38d2c40340..5c3fd5547d 100644
--- a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
+++ b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
@@ -7,6 +7,8 @@
#include <model.h>
+#include <app/app_version.h>
+
#include <projectexplorer/kit.h>
#include <projectexplorer/target.h>
#include <utils/algorithm.h>
@@ -40,7 +42,9 @@ Utils::FilePath pathForBinPuppet(ProjectExplorer::Target *target)
QtSupport::QtVersion *currentQtVersion = QtSupport::QtKitAspect::qtVersion(target->kit());
if (currentQtVersion)
- return currentQtVersion->binPath().pathAppended("qml2puppet").withExecutableSuffix();
+ return currentQtVersion->binPath()
+ .pathAppended(QString{"qml2puppet-"} + Core::Constants::IDE_VERSION_LONG)
+ .withExecutableSuffix();
return {};
}