From 54cd881a400b66bc7abfb57a732ef35633819e83 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 5 Feb 2020 15:16:04 +0100 Subject: CMakePM: Fix handling of qml debugging Add a respective aspect to the build configuration for handling qml debugging from the build side similar to what we do with qmake and qbs. Qml debugging needs to get enabled on the build side before the settings on the run configuration page has an effect. Fixes: QTCREATORBUG-23541 Change-Id: I86267747601015760737d8b21978712896892a37 Reviewed-by: Christian Kandeler --- src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp') diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index d33c5f48ac9..89202c8135b 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -699,6 +700,8 @@ void CMakeBuildSystem::updateQmlJSCodeModel() foreach (const QString &cmakeImport, CMakeConfigItem::cmakeSplitValue(cmakeImports)) projectInfo.importPaths.maybeInsert(FilePath::fromString(cmakeImport), QmlJS::Dialect::Qml); + project()->setProjectLanguage(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID, + !projectInfo.sourceFiles.isEmpty()); modelManager->updateProjectInfo(projectInfo, p); } -- cgit v1.2.3