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

Unify projectexplorer language IDs

Browse Source 
We don't need two IDs for C++ and the QmlJS ID should look the same as
as the others.

Change-Id: Ib9747f6b36a90bb652951d85eec69666615670c4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Ulf Hermann
2017-01-30 14:59:10 +01:00
parent 1dd407736a
commit c70b689526
17 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,7 +234,7 @@ bool DebuggerRunConfigurationAspect::useCppDebugger() const
{
if (d.useCppDebugger == AutoEnabledLanguage)
return runConfiguration()->target()->project()->projectLanguages().contains(
ProjectExplorer::Constants::LANG_CXX);
ProjectExplorer::Constants::CXX_LANGUAGE_ID);
return d.useCppDebugger == EnabledLanguage;
}
@@ -242,7 +242,7 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const
{
if (d.useQmlDebugger == AutoEnabledLanguage) {
const Core::Context languages = runConfiguration()->target()->project()->projectLanguages();
if (!languages.contains(ProjectExplorer::Constants::LANG_QMLJS))
if (!languages.contains(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID))
return false;
//
@@ -259,7 +259,7 @@ bool DebuggerRunConfigurationAspect::useQmlDebugger() const
}
}
return !languages.contains(ProjectExplorer::Constants::LANG_CXX);
return !languages.contains(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
}
return d.useQmlDebugger == EnabledLanguage;
}