diff options
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.h | 1 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4project.cpp | 3 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h index 9ba0248f34..0a81420207 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.h +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h @@ -84,6 +84,7 @@ public: ::Utils::Environment qmlDumpEnvironment; QString qtImportsPath; + QString qtQmlPath; QString qtVersionString; }; diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index a598d5d93a..8e38a7877b 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/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); diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index f9d33f6505..0fb8d7fc38 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/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; |