feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Prefer autodected kits and use replacment kits only as fallback

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2022-07-20 18:45:32 +02:00
parent 20e241737e
commit 63200ff771
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -599,6 +599,10 @@ Project::RestoreResult QmlProject::fromMap(const QVariantMap &map, QString *erro
auto setKitWithVersion = [&](int qtMajorVersion) { auto setKitWithVersion = [&](int qtMajorVersion) {
const QList<Kit *> qtVersionkits const QList<Kit *> qtVersionkits
= Utils::filtered(kits, [qtMajorVersion](const Kit *k) { = Utils::filtered(kits, [qtMajorVersion](const Kit *k) {
if (!k->isAutoDetected())
return false;
if (k->isReplacementKit())
return false;
QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k); QtSupport::QtVersion *version = QtSupport::QtKitAspect::qtVersion(k);
return (version && version->qtVersion().majorVersion == qtMajorVersion); return (version && version->qtVersion().majorVersion == qtMajorVersion);
}); });