Commit 61504082 authored by Christian Kamm's avatar Christian Kamm
Browse files

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

Task-number: QTCREATORBUG-2639
Reviewed-by: dt
parent 404186a9
......@@ -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()) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment