diff options
| author | Tomasz Olszak <olszak.tomasz@gmail.com> | 2017-06-29 15:00:11 +0200 |
|---|---|---|
| committer | Marco Benelli <marco.benelli@qt.io> | 2017-07-04 14:45:29 +0000 |
| commit | 70ffdb99d8d6b0610ab4a6bc6f765f1c46b59980 (patch) | |
| tree | 1f8979adcd230bdf1e6675d5fd026e3d91365b3f /src/plugins/qmljstools/qmljsmodelmanager.cpp | |
| parent | 8f1ecc2f1c8207a80d2c204ed3674b99b3b6d217 (diff) | |
Add QML2_IMPORT_PATH to qmlplugindump if defined in build configuration
Change-Id: I0e3a6beda6cca2a065b2d47115b04362d82c879a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Diffstat (limited to 'src/plugins/qmljstools/qmljsmodelmanager.cpp')
| -rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 60f7566713b..d28cc3ab87e 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -106,6 +106,10 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject( if (BuildConfiguration *bc = activeTarget->activeBuildConfiguration()) { preferDebugDump = bc->buildType() == BuildConfiguration::Debug; 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) |