From 7cb9b0cfaad2b8425da9fd3459dd9d8060a08ff2 Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Thu, 13 Nov 2014 12:31:47 +0100 Subject: [PATCH] qmakeproject: set qmljs language preserving other languages Change-Id: Ifebe972a20359841d99e6a892776811692c8d092 Reviewed-by: Daniel Teske --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index bcfbdbfd2a3..20691ee95fe 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -649,10 +649,8 @@ void QmakeProject::updateQmlJSCodeModel() // library then chances of the project being a QML project is quite high. // This assumption fails when there are no QDeclarativeEngine/QDeclarativeView (QtQuick 1) // or QQmlEngine/QQuickView (QtQuick 2) instances. - Core::Context pl(ProjectExplorer::Constants::LANG_CXX); if (hasQmlLib) - pl.add(ProjectExplorer::Constants::LANG_QMLJS); - setProjectLanguages(pl); + addProjectLanguage(ProjectExplorer::Constants::LANG_QMLJS); projectInfo.activeResourceFiles.removeDuplicates(); projectInfo.allResourceFiles.removeDuplicates();