diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-09-04 11:48:17 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-09-08 09:47:42 +0200 |
| commit | 0a611e7ce13e598114497520af6f45e14fea4b27 (patch) | |
| tree | e5e45efb22351f0f693a80ec8ced01584e6eab1b | |
| parent | f62e1fb36f7170bd132a5ede2c29fa64d1ea0dc5 (diff) | |
| download | qt-creator-0a611e7ce13e598114497520af6f45e14fea4b27.tar.gz | |
qmljs: always add environment paths to the qml vContexts
Change-Id: Ib2c0650aa4dcf1b5365c8521e5145003faf216ac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | src/libs/qmljs/qmljsmodelmanagerinterface.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp index a9f7adf64e..f4238241af 100644 --- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp +++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp @@ -1342,6 +1342,8 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx, foreach (const QString &path, pInfo.importPaths) res.maybeAddPath(path); } + foreach (const QString &path, environmentImportPaths()) + res.maybeAddPath(path); break; } case Language::NoLanguage: @@ -1366,6 +1368,11 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx, if (res.language == Language::AnyLanguage || res.language == Language::Qml || res.language == Language::QmlQtQuick1) res.maybeAddPath(info.qtQmlPath); + if (res.language == Language::AnyLanguage || res.language == Language::Qml + || res.language == Language::QmlQtQuick1 || res.language == Language::QmlQtQuick2) { + foreach (const QString &path, environmentImportPaths()) + res.maybeAddPath(path); + } break; } res.flags = ViewerContext::Complete; |