feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProject: Tell the code model about the target Qt's import path.

Browse Source 
Task-number: QTCREATORBUG-2639
Reviewed-by: Thomas Hartmann
This commit is contained in:
Christian Kamm
2010-10-13 13:03:32 +02:00
parent 6f41ebafc7
commit 404186a919
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -38,6 +38,7 @@
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/filewatcher.h> #include <projectexplorer/filewatcher.h>
#include <qt4projectmanager/qmldumptool.h> #include <qt4projectmanager/qmldumptool.h>
#include <qt4projectmanager/qtversionmanager.h>
#include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljsmodelmanagerinterface.h>
#include <QTextStream> #include <QTextStream>
@@ -171,6 +172,21 @@ QStringList QmlProject::importPaths() const
QStringList importPaths; QStringList importPaths;
if (m_projectItem) if (m_projectItem)
importPaths = m_projectItem.data()->importPaths(); 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 Qt4ProjectManager::QtVersion *qtVersion = runConfig->qtVersion();
if (qtVersion && qtVersion->isValid()) {
const QString qtVersionImportPath = qtVersion->versionInfo().value("QT_INSTALL_IMPORTS");
if (!qtVersionImportPath.isEmpty())
importPaths += qtVersionImportPath;
}
}
}
return importPaths; return importPaths;
} }