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

Add QML2_IMPORT_PATH to qmlplugindump if defined in build configuration

Browse Source 
Change-Id: I0e3a6beda6cca2a065b2d47115b04362d82c879a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
This commit is contained in:
Tomasz Olszak
2017-06-29 15:00:11 +02:00
committed by Marco Benelli
parent 8f1ecc2f1c
commit 70ffdb99d8
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,10 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
if (BuildConfiguration *bc = activeTarget->activeBuildConfiguration()) { if (BuildConfiguration *bc = activeTarget->activeBuildConfiguration()) {
preferDebugDump = bc->buildType() == BuildConfiguration::Debug; preferDebugDump = bc->buildType() == BuildConfiguration::Debug;
setPreferDump = true; setPreferDump = true;
// Append QML2_IMPORT_PATH if it is defined in build configuration.
// It enables qmlplugindump to correctly dump custom plugins or other dependent
// plugins that are not installed in default Qt qml installation directory.
projectInfo.qmlDumpEnvironment.appendOrSet("QML2_IMPORT_PATH", bc->environment().value("QML2_IMPORT_PATH"), ":");
} }
} }
if (!setPreferDump && qtVersion) if (!setPreferDump && qtVersion)