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

Qt4Project: Push the Qt version's QML import path to the code model.

Browse Source 
Task-number: QTCREATORBUG-2639
Reviewed-by: dt
This commit is contained in:
Christian Kamm
2010-10-13 13:05:36 +02:00
parent 404186a919
commit 61504082a9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -587,6 +587,14 @@ void Qt4Project::updateQmlJSCodeModel()
foreach (Qt4ProFileNode *node, proFiles) { foreach (Qt4ProFileNode *node, proFiles) {
projectInfo.importPaths.append(node->variableValue(QmlImportPathVar)); 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(); projectInfo.importPaths.removeDuplicates();
if (projectInfo.qmlDumpPath.isNull()) { if (projectInfo.qmlDumpPath.isNull()) {