From: Marco Bubke <marco.bubke@nokia.com>
Date: Wed, 2 Feb 2011 16:16:32 +0000 (+0100)
Subject: QmlDesigner.NodeInstances: Environment variable for qmlpuppet output
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1b1b50320969b168d048e65bc161ebbb48c2550b;p=qt-creator-jp%2Fqt-creator-jp.git

QmlDesigner.NodeInstances: Environment variable for qmlpuppet output

If FORWARD_QMLPUPPET_OUTPUT is set the output of qmlpuppet is forwarded.
---

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
index 9ce746b9ce..b0219afb7d 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
@@ -64,14 +64,17 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
    m_qmlPuppetEditorProcess = new QProcess(this);
    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()));
-   m_qmlPuppetEditorProcess->setProcessChannelMode(QProcess::ForwardedChannels);
+   bool fowardQmlpuppetOutput = !qgetenv("FORWARD_QMLPUPPET_OUTPUT").isEmpty();
+   if (fowardQmlpuppetOutput)
+       m_qmlPuppetEditorProcess->setProcessChannelMode(QProcess::ForwardedChannels);
    m_qmlPuppetEditorProcess->start(applicationPath, QStringList() << socketToken << "editormode" << "-graphicssystem raster");
 
    if (runModus == NormalModus) {
        m_qmlPuppetPreviewProcess = new QProcess(this);
        connect(m_qmlPuppetPreviewProcess.data(), SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished(int,QProcess::ExitStatus)));
        connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), m_qmlPuppetPreviewProcess.data(), SLOT(kill()));
-       m_qmlPuppetPreviewProcess->setProcessChannelMode(QProcess::ForwardedChannels);
+       if (fowardQmlpuppetOutput)
+           m_qmlPuppetPreviewProcess->setProcessChannelMode(QProcess::ForwardedChannels);
        m_qmlPuppetPreviewProcess->start(applicationPath, QStringList() << socketToken << "previewmode" << "-graphicssystem raster");
    }