aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
diff options
context:
space:
mode:
authorChristian Stenger <[email protected]>2020-02-05 15:16:04 +0100
committerChristian Stenger <[email protected]>2020-02-07 11:55:37 +0000
commit54cd881a400b66bc7abfb57a732ef35633819e83 (patch)
treebe2f783ddc4cc2fd082f03cc588505d9f26582c7 /src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
parent11abdb9ddc7b278711e1780dab91cbe92dff9915 (diff)
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 <[email protected]>
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp3
1 files changed, 3 insertions, 0 deletions
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 <coreplugin/progressmanager/progressmanager.h>
#include <cpptools/cppprojectupdater.h>
#include <cpptools/generatedcodemodelsupport.h>
+#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/project.h>
#include <projectexplorer/target.h>
@@ -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);
}