diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index abd4f2e5a465df270e9e23e5abd5791504b4de52..a598d5d93a1974a7cb0c2c29062feb17a5ab0210 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(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 af49bfa284dc7f96ecb50b37ceaa369ca3859098..26b66917fe8f3d7b8dce50bd5ec80eb651198d3a 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 6d16731a37511e9e831c909aa622a440717fad6e..4ffa15fef4b95a136bacaf0486c9633e87d31715 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(target()->project()); - foreach (const QString &importPath, project->importPaths()) { + foreach (const QString &importPath, project->customImportPaths()) { Utils::QtcProcess::addArg(&args, "-I"); Utils::QtcProcess::addArg(&args, importPath); }