Commit d4d677ed authored by Thomas Hartmann's avatar Thomas Hartmann Committed by Eike Ziller
Browse files

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: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent aaafacfb
......@@ -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();
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment