From 329fac55106a73d95c1ab0cdbef4b0597070c821 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Wed, 12 Oct 2022 11:02:21 +0200
Subject: [PATCH] QmlDesigner: Add version number to puppet path

Task-number: QDS-7985
Change-Id: I584e2b4a56e441dba207ebffbca8bf0baca7fcb6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp | 5 ++++-
 src/tools/qml2puppet/CMakeLists.txt                         | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp b/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
index d49bdc54810..227fdf4ad50 100644
--- a/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
+++ b/src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
@@ -5,6 +5,7 @@
 
 #include "qmldesignerplugin.h"
 
+#include <app/app_version.h>
 #include <edit3d/edit3dviewconfig.h>
 #include <itemlibraryimport.h>
 #include <projectexplorer/kit.h>
@@ -179,7 +180,9 @@ Utils::FilePath qmlPuppetWorkingDirectory(ProjectExplorer::Target *target,
 
 QString qmlPuppetExecutablePath(const Utils::FilePath &workingDirectory)
 {
-    return workingDirectory.pathAppended("qml2puppet").withExecutableSuffix().toString();
+    return workingDirectory.pathAppended(QString{"qml2puppet-"} + Core::Constants::IDE_VERSION_LONG)
+        .withExecutableSuffix()
+        .toString();
 }
 
 bool isForcingFreeType(ProjectExplorer::Target *target)
diff --git a/src/tools/qml2puppet/CMakeLists.txt b/src/tools/qml2puppet/CMakeLists.txt
index ab80e649865..f615e7322a4 100644
--- a/src/tools/qml2puppet/CMakeLists.txt
+++ b/src/tools/qml2puppet/CMakeLists.txt
@@ -117,6 +117,8 @@ add_qtc_executable(qml2puppet
   DESTINATION ${DESTDIR}
 )
 
+set_target_properties(qml2puppet PROPERTIES OUTPUT_NAME qml2puppet-${IDE_VERSION})
+
 extend_qtc_executable(qml2puppet
   CONDITION Qt5_VERSION VERSION_GREATER_EQUAL 6.0.0
   SOURCES_PREFIX "${SRCDIR}/"