From f766c2f5dcbca19fbd4ad9fb64371352855f6aa3 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Wed, 8 Feb 2023 13:28:53 +0100
Subject: [PATCH] qmlprojectmanager: fix Cannot run Qt5 projects

qml2puppet only enables the qmlruntime feature if it
was built against a Qt 6.

Task-number: QDS-9088
Change-Id: If573cae305ef18c11101a591e6c1e38f133b7914
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 .../qmlprojectmanager/qmlprojectrunconfiguration.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index d996ac93fdd..745f0a64e44 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -190,11 +190,13 @@ FilePath QmlProjectRunConfiguration::qmlRuntimeFilePath() const
         // If not given explicitly by Qt Version, try to pick it from $PATH.
         const bool isDesktop = version->type() == QtSupport::Constants::DESKTOPQT;
 
-        auto [workingDirectoryPath, puppetPath] = QmlDesigner::QmlPuppetPaths::qmlPuppetPaths(
-            target(), QmlDesigner::QmlDesignerBasePlugin::settings());
-        if (!puppetPath.isEmpty()) {
-            usePuppetAsQmlRuntime = true;
-            return puppetPath;
+        if (version->qtVersion().majorVersion() > 5) {
+            auto [workingDirectoryPath, puppetPath] = QmlDesigner::QmlPuppetPaths::qmlPuppetPaths(
+                        target(), QmlDesigner::QmlDesignerBasePlugin::settings());
+            if (!puppetPath.isEmpty()) {
+                usePuppetAsQmlRuntime = true;
+                return puppetPath;
+            }
         }
 
         return isDesktop ? version->qmlRuntimeFilePath() : "qmlscene";