From a1f773bb6675c43519251d34f64ea116a4177aae Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 8 Sep 2023 10:24:11 +0200
Subject: [PATCH] QmlDesigner: Only show valid kits with valid Qt version

Task-number: QDS-10137
Change-Id: I582d714b2f4b670ca42b2d6e734489efe0efbf75
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 .../qmldesigner/components/toolbar/toolbarbackend.cpp  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
index 99c46b43b33..f350bd276d5 100644
--- a/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
+++ b/src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp
@@ -28,6 +28,7 @@
 #include <projectexplorer/target.h>
 
 #include <qmlprojectmanager/qmlproject.h>
+#include <qtsupport/qtkitinformation.h>
 
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
@@ -617,8 +618,13 @@ int ToolBarBackend::currentStyle() const
 
 QStringList ToolBarBackend::kits() const
 {
-    return Utils::transform(ProjectExplorer::KitManager::kits(),
-                            [](ProjectExplorer::Kit *kit) { return kit->displayName(); });
+    auto kits = Utils::filtered(ProjectExplorer::KitManager::kits(), [](ProjectExplorer::Kit *kit) {
+        const auto qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
+        return kit->isValid() && !kit->isReplacementKit() && qtVersion && qtVersion->isValid()
+            /*&& kit->isAutoDetected() */;
+    });
+
+    return Utils::transform(kits, [](ProjectExplorer::Kit *kit) { return kit->displayName(); });
 }
 
 int ToolBarBackend::currentKit() const