From d4d677ed2536408d83676212496855370d340702 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 25 Feb 2015 14:56:16 +0100 Subject: QmlDesigner: Do not set QML_IMPORT_PATH for the fallback puppet QML[2]_IMPORT_PATH does override the search path defined in the qt.conf. This means that defining QML_IMPORT_PATH does break the fallback puppet. Task-number: QTCREATORBUG-14031 Change-Id: I1441d18f7068df2b8068c70519507088ab41eed8 Reviewed-by: Eike Ziller --- .../qmldesigner/designercore/instances/puppetcreator.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index 075b3f8b3c..8b203618ea 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -345,10 +345,14 @@ QProcessEnvironment PuppetCreator::processEnvironment() const environment.set("QML_BAD_GUI_RENDER_LOOP", "true"); environment.set("QML_USE_MOCKUPS", "true"); environment.set("QML_PUPPET_MODE", "true"); - if (m_puppetVersion == Qml1Puppet) - environment.appendOrSet("QML_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); - else - environment.appendOrSet("QML2_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); + + if (m_availablePuppetType != FallbackPuppet) { + if (m_puppetVersion == Qml1Puppet) + environment.appendOrSet("QML_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); + else + environment.appendOrSet("QML2_IMPORT_PATH", m_model->importPaths().join(pathSep), pathSep); + } + return environment.toProcessEnvironment(); } -- cgit v1.2.3