From 386e204685726fb47e24c225b98a54dab89c2e2e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 8 Mar 2011 16:52:12 +0100 Subject: [PATCH] QmlDesigner.qmlPuppet: allows specifying alternative to qmlpuppet This allows the user to specify another qmlpuppet then the one delivered with QtCreator. For example a pupper build with mingw. The enviroment variable QTCREATOR_QMLPUPPET_PATH is used. Reviewed-by: Kai Koehne --- .../designercore/instances/nodeinstanceserverproxy.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index 479d064a1f9..a70241602eb 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -95,6 +95,11 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV #endif applicationPath += "/qmlpuppet"; + QByteArray envImportPath = qgetenv("QTCREATOR_QMLPUPPET_PATH"); + if (!envImportPath.isEmpty()) { + applicationPath = envImportPath; + } + m_qmlPuppetEditorProcess = new QProcess; connect(m_qmlPuppetEditorProcess.data(), SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished(int,QProcess::ExitStatus))); connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), m_qmlPuppetEditorProcess.data(), SLOT(kill()));