From f0d5ad714e7487b16e6c068d15f108a5d983afaf Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Mon, 3 Dec 2012 15:28:34 +0100
Subject: [PATCH] QmlProject: Don't add Qt import on command line

Actually this can lead to crashes if passing the QtQuick1 import
path to qmlscene.

The removed code was introduced in 404186a919b5655054. However,
the Qt import path for the code model is also added in
QmlProject::refresh().

Task-number: QTCREATORBUG-8365
Change-Id: I8581ce3d67c83c0f27d7b8aefedf9765935bedbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
---
 src/plugins/qmlprojectmanager/qmlproject.cpp   | 18 ++----------------
 src/plugins/qmlprojectmanager/qmlproject.h     |  2 +-
 .../qmlprojectrunconfiguration.cpp             |  2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index abd4f2e5a4..a598d5d93a 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -170,7 +170,7 @@ void QmlProject::refresh(RefreshOptions options)
 
     QmlJS::ModelManagerInterface::ProjectInfo pinfo(this);
     pinfo.sourceFiles = files();
-    pinfo.importPaths = importPaths();
+    pinfo.importPaths = customImportPaths();
     QtSupport::BaseQtVersion *version = 0;
     if (activeTarget()) {
         ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(activeTarget()->kit());
@@ -220,26 +220,12 @@ bool QmlProject::validProjectFile() const
     return !m_projectItem.isNull();
 }
 
-QStringList QmlProject::importPaths() const
+QStringList QmlProject::customImportPaths() const
 {
     QStringList importPaths;
     if (m_projectItem)
         importPaths = m_projectItem.data()->importPaths();
 
-    // add the default import path for the target Qt version
-    if (activeTarget()) {
-        const QmlProjectRunConfiguration *runConfig =
-                qobject_cast<QmlProjectRunConfiguration*>(activeTarget()->activeRunConfiguration());
-        if (runConfig) {
-            const QtSupport::BaseQtVersion *qtVersion = runConfig->qtVersion();
-            if (qtVersion && qtVersion->isValid()) {
-                const QString qtVersionImportPath = qtVersion->qmakeProperty("QT_INSTALL_IMPORTS");
-                if (!qtVersionImportPath.isEmpty())
-                    importPaths += qtVersionImportPath;
-            }
-        }
-    }
-
     return importPaths;
 }
 
diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h
index af49bfa284..26b66917fe 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.h
+++ b/src/plugins/qmlprojectmanager/qmlproject.h
@@ -87,7 +87,7 @@ public:
     QDir projectDir() const;
     QStringList files() const;
     QString mainFile() const;
-    QStringList importPaths() const;
+    QStringList customImportPaths() const;
 
     bool addFiles(const QStringList &filePaths);
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 6d16731a37..4ffa15fef4 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -144,7 +144,7 @@ QString QmlProjectRunConfiguration::viewerArguments() const
 
     // arguments from .qmlproject file
     QmlProject *project = static_cast<QmlProject *>(target()->project());
-    foreach (const QString &importPath, project->importPaths()) {
+    foreach (const QString &importPath, project->customImportPaths()) {
         Utils::QtcProcess::addArg(&args, "-I");
         Utils::QtcProcess::addArg(&args, importPath);
     }
-- 
GitLab