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

qmakeproject: set qmljs language preserving other languages

Browse Source 
Change-Id: Ifebe972a20359841d99e6a892776811692c8d092
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Fawzi Mohamed
2014-11-13 12:31:47 +01:00
committed by Fawzi Mohamed
parent 3c3ded74fe
commit 7cb9b0cfaa
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -649,10 +649,8 @@ void QmakeProject::updateQmlJSCodeModel()
// library then chances of the project being a QML project is quite high. // library then chances of the project being a QML project is quite high.
// This assumption fails when there are no QDeclarativeEngine/QDeclarativeView (QtQuick 1) // This assumption fails when there are no QDeclarativeEngine/QDeclarativeView (QtQuick 1)
// or QQmlEngine/QQuickView (QtQuick 2) instances. // or QQmlEngine/QQuickView (QtQuick 2) instances.
Core::Context pl(ProjectExplorer::Constants::LANG_CXX);
if (hasQmlLib) if (hasQmlLib)
pl.add(ProjectExplorer::Constants::LANG_QMLJS); addProjectLanguage(ProjectExplorer::Constants::LANG_QMLJS);
setProjectLanguages(pl);
projectInfo.activeResourceFiles.removeDuplicates(); projectInfo.activeResourceFiles.removeDuplicates();
projectInfo.allResourceFiles.removeDuplicates(); projectInfo.allResourceFiles.removeDuplicates();