From 76afffe43a14f1cde3742f901f21459835380437 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 18 Mar 2014 16:55:20 +0100 Subject: [PATCH] Enable QML debugging only if project includes a qml library Use the same check as in the DebuggerRunConfigurationAspect to decide whether to enable qml debugging, or not. This allows us to follow the qmakestep setting in the run settings in a follow-up change. Task-number: QTCREATORBUG-11474 Change-Id: I67900cf719a56c0246e792c6aca66ce8e5d77daf Reviewed-by: Eike Ziller Reviewed-by: Alessandro Portale --- src/plugins/qmakeprojectmanager/qmakestep.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index b6e061f4ced..cd547885e84 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -44,6 +44,7 @@ #include #include +#include #include #include #include @@ -367,6 +368,10 @@ bool QMakeStep::linkQmlDebuggingLibrary() const return true; if (m_linkQmlDebuggingLibrary == DoNotLink) return false; + + const Core::Context languages = project()->projectLanguages(); + if (!languages.contains(ProjectExplorer::Constants::LANG_QMLJS)) + return false; return (qmakeBuildConfiguration()->buildType() & BuildConfiguration::Debug); }