diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-11 11:11:31 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-11 11:15:49 +0200 |
| commit | 17c313756b25df0648ff2b6b925f807c845a566d (patch) | |
| tree | 9916e9e9556d523a44bbcb8936257e82e2dde48f | |
| parent | 8d6231397efd0ba1a8bd144d79560050740a6d92 (diff) | |
| download | qt-creator-17c313756b25df0648ff2b6b925f807c845a566d.tar.gz | |
QmlDesigner.Instances: Do not use Qt kit for fallback puppet
Change-Id: I825c7f2380a376b30cc647942aa7d252aa9d36df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp index ff66653875..09cdaa7e62 100644 --- a/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp +++ b/src/plugins/qmldesigner/designercore/instances/puppetcreator.cpp @@ -331,7 +331,8 @@ QString PuppetCreator::qmlPuppetPath(PuppetType puppetType) const QProcessEnvironment PuppetCreator::processEnvironment() const { Utils::Environment environment = Utils::Environment::systemEnvironment(); - m_kit->addToEnvironment(environment); + if (!useOnlyFallbackPuppet()) + m_kit->addToEnvironment(environment); environment.set("QML_BAD_GUI_RENDER_LOOP", "true"); environment.set("QML_USE_MOCKUPS", "true"); environment.set("QML_PUPPET_MODE", "true"); |