feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.6'

Browse Source 
Change-Id: I8223551aec66539dd8c55262e5000c1621410334
This commit is contained in:
Eike Ziller
2015-12-15 12:21:49 +01:00
parent 75cfa50771 aa6fb0da41
commit ff60bf37c9
54 changed files with 3096 additions and 883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggerrunconfigurationaspect.cpp
View File

@@ -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;
}