Merge remote-tracking branch 'origin/3.6'

Change-Id: I8223551aec66539dd8c55262e5000c1621410334

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index c4095912e8..3e4e3719d4 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -245,6 +245,10 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const
 bool DebuggerRunConfigurationAspect::useQmlDebugger() const
 {
     if (d.useQmlDebugger == 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)
@@ -259,9 +263,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 d.useQmlDebugger == EnabledLanguage;
 }