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

Debugger: Don't auto-enable QML debugging if LANG_QMLJS isn't set

Browse Source 
Change-Id: Id2734ed9615e6c4035d2eacb5bf57dbb2d5029e4
Task-number: QTCREATORBUG-15490
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-12-11 10:43:47 +01:00
parent 48270d58a6
commit 4e6d2a201f
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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