From 61504082a976a95234dc6d26d9760529e5949f89 Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Wed, 13 Oct 2010 13:05:36 +0200
Subject: [PATCH] Qt4Project: Push the Qt version's QML import path to the code
model.
Task-number: QTCREATORBUG-2639
Reviewed-by: dt
---
src/plugins/qt4projectmanager/qt4project.cpp | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 408a259ba86..b1fbc90bf4e 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -587,6 +587,14 @@ void Qt4Project::updateQmlJSCodeModel()
foreach (Qt4ProFileNode *node, proFiles) {
projectInfo.importPaths.append(node->variableValue(QmlImportPathVar));
}
+ if (activeTarget() && activeTarget()->activeBuildConfiguration()) {
+ const QtVersion *qtVersion = activeTarget()->activeBuildConfiguration()->qtVersion();
+ if (qtVersion->isValid()) {
+ const QString qtVersionImportPath = qtVersion->versionInfo().value("QT_INSTALL_IMPORTS");
+ if (!qtVersionImportPath.isEmpty())
+ projectInfo.importPaths += qtVersionImportPath;
+ }
+ }
projectInfo.importPaths.removeDuplicates();
if (projectInfo.qmlDumpPath.isNull()) {
--
GitLab