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

5
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -135,7 +135,7 @@ QbsProject::QbsProject(QbsManager *manager, const QString &fileName) :
setRootProjectNode(new QbsRootProjectNode(this));
setProjectContext(Context(Constants::PROJECT_ID));
setProjectLanguages(Context(ProjectExplorer::Constants::LANG_CXX));
setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));
connect(this, &Project::activeTargetChanged, this, &QbsProject::changeActiveTarget);
connect(this, &Project::addedTarget, this, &QbsProject::targetWasAdded);
@@ -1137,7 +1137,8 @@ void QbsProject::updateQmlJsCodeModel()
}
}
setProjectLanguage(ProjectExplorer::Constants::LANG_QMLJS, !projectInfo.sourceFiles.isEmpty());
setProjectLanguage(ProjectExplorer::Constants::QMLJS_LANGUAGE_ID,
!projectInfo.sourceFiles.isEmpty());
modelManager->updateProjectInfo(projectInfo, this);
}