diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2015-02-25 14:56:16 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-02-26 14:59:45 +0000 |
| commit | d4d677ed2536408d83676212496855370d340702 (patch) | |
| tree | 1df4eaa05948e41dd5e24c704b78f69142366924 | |
| parent | aaafacfbdf8d7e1bd786b4b7c5bfa1edfc5c23cc (diff) | |
| download | qt-creator-d4d677ed2536408d83676212496855370d340702.tar.gz | |
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 <eike.ziller@theqtcompany.com>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 12 |
1 files 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(); } |