From d9404208dae192f318d150df4aed502f0a331c76 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 25 Jan 2024 11:50:00 +0100
Subject: [PATCH] ProjectExplorer: declare only relevant aspects as features

This will disable python kits for all Wizards that require a valid Qt.

Change-Id: I4a8d6dd60629ddb556e49c067200acba8ef080d2
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/projectexplorer/kit.cpp    | 6 ++++--
 src/plugins/python/pythonkitaspect.cpp | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/projectexplorer/kit.cpp b/src/plugins/projectexplorer/kit.cpp
index d2a83381254..fee30ed23fb 100644
--- a/src/plugins/projectexplorer/kit.cpp
+++ b/src/plugins/projectexplorer/kit.cpp
@@ -725,8 +725,10 @@ QSet<Id> Kit::supportedPlatforms() const
 QSet<Id> Kit::availableFeatures() const
 {
     QSet<Id> features;
-    for (const KitAspectFactory *factory : KitManager::kitAspectFactories())
-        features |= factory->availableFeatures(this);
+    for (const KitAspectFactory *factory : KitManager::kitAspectFactories()) {
+        if (relevantAspects().isEmpty() || relevantAspects().contains(factory->id()))
+            features |= factory->availableFeatures(this);
+    }
     return features;
 }
 
diff --git a/src/plugins/python/pythonkitaspect.cpp b/src/plugins/python/pythonkitaspect.cpp
index 4846f12c12d..2c700f58ae5 100644
--- a/src/plugins/python/pythonkitaspect.cpp
+++ b/src/plugins/python/pythonkitaspect.cpp
@@ -147,7 +147,7 @@ public:
 
     QSet<Id> availableFeatures(const Kit *k) const override
     {
-        if (k->isAspectRelevant(PythonKitAspect::id()) && PythonKitAspect::python(k))
+        if (PythonKitAspect::python(k))
             return {PythonKitAspect::id()};
         return {};
     }