forked from qt-creator/qt-creator
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>
This commit is contained in:
committed by
Eike Ziller
parent
aaafacfbdf
commit
d4d677ed25
@@ -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();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user