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

Merge remote-tracking branch 'origin/4.3' into master

Browse Source 
Change-Id: I83af635dcac98e4fd78b21d8dd9dc3a27a4fdf94
This commit is contained in:
Orgad Shaneh
2017-06-12 10:00:50 +03:00
parent 1d921ae044 98c35d6cd9
commit 6b0e1bc5f8
24 changed files with 9195 additions and 5567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -77,6 +77,7 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
Project *project) const
{
ModelManagerInterface::ProjectInfo projectInfo(project);
projectInfo.qmlDumpEnvironment = Utils::Environment::systemEnvironment();
Target *activeTarget = nullptr;
if (project) {
const QSet<QString> qmlTypeNames = { Constants::QML_MIMETYPE ,Constants::QBS_MIMETYPE,