qmljs: add qt5 qmlpath to code model paths

Change-Id: Ie0fd6f74818def859ab5bcb6fa104c4eec1b67fb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

src/libs/qmljs/qmljsmodelmanagerinterface.h

@@ -84,6 +84,7 @@ public:
         ::Utils::Environment qmlDumpEnvironment;
 
         QString qtImportsPath;
+        QString qtQmlPath;
         QString qtVersionString;
     };
 

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -180,6 +180,7 @@ void QmlProject::refresh(RefreshOptions options)
     if (version) {
         pinfo.tryQmlDump = true;
         pinfo.qtImportsPath = version->qmakeProperty("QT_INSTALL_IMPORTS");
+        pinfo.qtQmlPath = version->qmakeProperty("QT_INSTALL_QML");
         pinfo.qtVersionString = version->qtVersionString();
     }
     m_modelManager->updateProjectInfo(pinfo);

src/plugins/qt4projectmanager/qt4project.cpp

@@ -610,6 +610,9 @@ void Qt4Project::updateQmlJSCodeModel()
     if (qtVersion && qtVersion->isValid()) {
         projectInfo.tryQmlDump = qtVersion->type() == QLatin1String(QtSupport::Constants::DESKTOPQT)
                 || qtVersion->type() == QLatin1String(QtSupport::Constants::SIMULATORQT);
+        projectInfo.qtQmlPath = qtVersion->qmakeProperty("QT_INSTALL_QML");
+        if (!projectInfo.qtQmlPath.isEmpty())
+            projectInfo.importPaths += projectInfo.qtQmlPath;
         projectInfo.qtImportsPath = qtVersion->qmakeProperty("QT_INSTALL_IMPORTS");
         if (!projectInfo.qtImportsPath.isEmpty())
             projectInfo.importPaths += projectInfo.qtImportsPath;