From 63200ff771ec7ed59ae0d78ea9ef86c2def95b51 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Wed, 20 Jul 2022 18:45:32 +0200
Subject: [PATCH] QmlDesigner: Prefer autodected kits and use replacment kits
 only as fallback

In QDS we want to priotize the kits we provide as part of the installation.

Change-Id: I282166bce811b6777088cd0dcde31dd8da785e2b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/qmlprojectmanager/qmlproject.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index b733601b28b..ba00ad797fd 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -599,6 +599,10 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
             auto setKitWithVersion = [&](int qtMajorVersion) {
                 const QList<Kit *> qtVersionkits
                     = Utils::filtered(kits, [qtMajorVersion](const Kit *k) {
+                          if (!k->isAutoDetected())
+                              return false;
+                          if (k->isReplacementKit())
+                              return false;
                           QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
                           return (version && version->qtVersion().majorVersion == qtMajorVersion);
                       });