aboutsummaryrefslogtreecommitdiffstats
path: root/qt-cpp
diff options
context:
space:
mode:
authorOrkun Tokdemir <orkun.tokdemir@qt.io>2024-10-09 08:25:34 +0200
committerOrkun Tokdemir <orkun.tokdemir@qt.io>2024-10-09 12:01:58 +0000
commitd352d07d7409d375fd24998b20561fff000bb2ed (patch)
treedc6e966d512b67508ca5e6c76eda5424ed829088 /qt-cpp
parentbfc6dc46b07e8281fb09834096fccef4219f989b (diff)
qt-cpp: Consider qtPaths related kits while fitering cmake kits
Since we generate kits from both the installation root and the qtPaths, we should also consider qtPaths related kits while filtering cmake kits. Change-Id: I1cc639a024298936d30813cde77ea462557081b7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qt-cpp')
-rw-r--r--qt-cpp/src/kit-manager.ts3
1 files changed, 2 insertions, 1 deletions
diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts
index 858d74f..ffe31bc 100644
--- a/qt-cpp/src/kit-manager.ts
+++ b/qt-cpp/src/kit-manager.ts
@@ -519,7 +519,8 @@ export class KitManager {
// that were created by the cmake extension as templates.
const kitsFromCMakeExtension = allCMakeKits.filter(
(kit) =>
- kit.environmentVariables?.VSCODE_QT_INSTALLATION_ROOT === undefined
+ kit.environmentVariables?.VSCODE_QT_INSTALLATION_ROOT === undefined &&
+ kit.environmentVariables?.VSCODE_QT_QTPATHS_EXE === undefined
);
logger.info(
`Kits from CMake extension: ${JSON.stringify(kitsFromCMakeExtension)}`