summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/qmljs/qmljsmodelmanagerinterface.cpp')
-rw-r--r--src/libs/qmljs/qmljsmodelmanagerinterface.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index 232e23f024..be664ba56d 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -1361,6 +1361,8 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx,
res.maybeAddPath(pAndL.path().toString());
}
}
+ foreach (const QString &path, environmentImportPaths())
+ res.maybeAddPath(path);
break;
}
case Dialect::NoLanguage:
@@ -1385,6 +1387,11 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx,
if (res.language == Dialect::AnyLanguage || res.language == Dialect::Qml
|| res.language == Dialect::QmlQtQuick1)
res.maybeAddPath(info.qtQmlPath);
+ if (res.language == Dialect::AnyLanguage || res.language == Dialect::Qml
+ || res.language == Dialect::QmlQtQuick1 || res.language == Dialect::QmlQtQuick2) {
+ foreach (const QString &path, environmentImportPaths())
+ res.maybeAddPath(path);
+ }
break;
}
res.flags = ViewerContext::Complete;