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

Merge remote-tracking branch 'origin/3.2'

Browse Source 
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
This commit is contained in:
Eike Ziller
2014-09-16 15:17:21 +02:00
parent 11f89ece8d a4db6db358
commit 914adeab82
77 changed files with 3943 additions and 2355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;