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

qmljs: always add environment paths to the qml vContexts

Browse Source 
Change-Id: Ib2c0650aa4dcf1b5365c8521e5145003faf216ac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-09-04 11:48:17 +02:00
parent f62e1fb36f
commit 0a611e7ce1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -1342,6 +1342,8 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx,
foreach (const QString &path, pInfo.importPaths) foreach (const QString &path, pInfo.importPaths)
res.maybeAddPath(path); res.maybeAddPath(path);
} }
foreach (const QString &path, environmentImportPaths())
res.maybeAddPath(path);
break; break;
} }
case Language::NoLanguage: case Language::NoLanguage:
@@ -1366,6 +1368,11 @@ ViewerContext ModelManagerInterface::completeVContext(const ViewerContext &vCtx,
if (res.language == Language::AnyLanguage || res.language == Language::Qml if (res.language == Language::AnyLanguage || res.language == Language::Qml
|| res.language == Language::QmlQtQuick1) || res.language == Language::QmlQtQuick1)
res.maybeAddPath(info.qtQmlPath); 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; break;
} }
res.flags = ViewerContext::Complete; res.flags = ViewerContext::Complete;