diff options
| author | BogDan Vatra <bogdan@kde.org> | 2015-01-22 17:36:53 +0200 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kde.org> | 2015-01-23 16:28:05 +0100 |
| commit | f23a5fc41d6d961db1174ffb27c051a4c4792133 (patch) | |
| tree | 0878cb8dfa1b27319b59b7acdc23eebfa3d6ea8a /src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp | |
| parent | 56dab9e9313a85d5b148bdf80e2871d6a55aabee (diff) | |
| download | qt-creator-f23a5fc41d6d961db1174ffb27c051a4c4792133.tar.gz | |
Set QML[2]_IMPORT_PATH evn variable when running qml[2]puppet
qml[2]puppet can't use any QML plugin that are defined in your .pro file
(using QML_IMPORT_PATH) unless we don't specify it.
Change-Id: I0fffb8a5da1023565fa9fce5cd4cf38f098a0df1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index 442bcc4c77..3f3eb9ae0a 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -123,32 +123,29 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV m_runModus(runModus), m_synchronizeId(-1) { - PuppetCreator puppetCreator(kit, QString()); - QString socketToken(QUuid::createUuid().toString()); m_localServer->listen(socketToken); m_localServer->setMaxPendingConnections(3); PuppetCreator::QmlPuppetVersion puppetVersion = hasQtQuick1(nodeInstanceView) ? PuppetCreator::Qml1Puppet : PuppetCreator::Qml2Puppet; + PuppetCreator puppetCreator(kit, QString(), nodeInstanceView->model(), puppetVersion); + - puppetCreator.createPuppetExecutableIfMissing(puppetVersion); + puppetCreator.createPuppetExecutableIfMissing(); - m_qmlPuppetEditorProcess = puppetCreator.createPuppetProcess(puppetVersion, - "editormode", + m_qmlPuppetEditorProcess = puppetCreator.createPuppetProcess("editormode", socketToken, this, SLOT(printEditorProcessOutput()), SLOT(processFinished(int,QProcess::ExitStatus))); if (runModus == NormalModus) { - m_qmlPuppetRenderProcess = puppetCreator.createPuppetProcess(puppetVersion, - "rendermode", + m_qmlPuppetRenderProcess = puppetCreator.createPuppetProcess("rendermode", socketToken, this, SLOT(printRenderProcessOutput()), SLOT(processFinished(int,QProcess::ExitStatus))); - m_qmlPuppetPreviewProcess = puppetCreator.createPuppetProcess(puppetVersion, - "previewmode", + m_qmlPuppetPreviewProcess = puppetCreator.createPuppetProcess("previewmode", socketToken, this, SLOT(printPreviewProcessOutput()), |