From b9e7fd2415897b9a17039e747a053e088d22c75f Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 30 Nov 2022 20:14:57 +0100
Subject: [PATCH] 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>
---
 src/plugins/qmldesigner/puppetenvironmentbuilder.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp b/src/plugins/qmldesigner/puppetenvironmentbuilder.cpp
index 38d2c403409..5c3fd5547df 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 {};
 }