From 70ffdb99d8d6b0610ab4a6bc6f765f1c46b59980 Mon Sep 17 00:00:00 2001 From: Tomasz Olszak Date: Thu, 29 Jun 2017 15:00:11 +0200 Subject: [PATCH] Add QML2_IMPORT_PATH to qmlplugindump if defined in build configuration Change-Id: I0e3a6beda6cca2a065b2d47115b04362d82c879a Reviewed-by: Thomas Hartmann Reviewed-by: Marco Benelli --- src/plugins/qmljstools/qmljsmodelmanager.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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)