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

2
src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
View File

@@ -130,7 +130,7 @@ QList<Core::Id> BaseProjectPartBuilder::createProjectPartsForFiles(const QString
if (cat.hasParts()) {
// The ProjextExplorer does not distinguish between other versions than C++ and QML.
languages += ProjectExplorer::Constants::LANG_CXX;
languages += ProjectExplorer::Constants::CXX_LANGUAGE_ID;
if (cat.hasCxxSources()) {
createProjectPart(cat.cxxSources(),

2
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -972,7 +972,7 @@ ProjectPart::Ptr CppModelManager::fallbackProjectPart()
bool CppModelManager::isCppEditor(Core::IEditor *editor)
{
return editor->context().contains(ProjectExplorer::Constants::LANG_CXX);
return editor->context().contains(ProjectExplorer::Constants::CXX_LANGUAGE_ID);
}
bool CppModelManager::isClangCodeModelActive() const