aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/debugger/debuggerrunconfigurationaspect.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 5c8713e473..d630eb9004 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -253,6 +253,10 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const
bool DebuggerRunConfigurationAspect::useQmlDebugger() const
{
if (m_useQmlDebugger == DebuggerRunConfigurationAspect::AutoEnabledLanguage) {
+ const Core::Context languages = runConfiguration()->target()->project()->projectLanguages();
+ if (!languages.contains(ProjectExplorer::Constants::LANG_QMLJS))
+ return false;
+
//
// Try to find a build step (qmake) to check whether qml debugging is enabled there
// (Using the Qt metatype system to avoid a hard qt4projectmanager dependency)
@@ -267,9 +271,7 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const
}
}
- const Core::Context languages = runConfiguration()->target()->project()->projectLanguages();
- return languages.contains(ProjectExplorer::Constants::LANG_QMLJS)
- && !languages.contains(ProjectExplorer::Constants::LANG_CXX);
+ return !languages.contains(ProjectExplorer::Constants::LANG_CXX);
}
return m_useQmlDebugger == DebuggerRunConfigurationAspect::EnabledLanguage;
}