Commit 4e6d2a20 authored by Ulf Hermann's avatar Ulf Hermann

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

Change-Id: Id2734ed9615e6c4035d2eacb5bf57dbb2d5029e4
Task-number: QTCREATORBUG-15490
Reviewed-by: default avatarhjk <hjk@theqtcompany.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@theqtcompany.com>
parent 48270d58
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment