OSDN Git Service

QmlDesigner.NodeInstances: Environment variable for qmlpuppet output
authorMarco Bubke <marco.bubke@nokia.com>
Wed, 2 Feb 2011 16:16:32 +0000 (17:16 +0100)
committerMarco Bubke <marco.bubke@nokia.com>
Wed, 2 Feb 2011 16:21:02 +0000 (17:21 +0100)
If FORWARD_QMLPUPPET_OUTPUT is set the output of qmlpuppet is forwarded.

src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

index 9ce746b..b0219af 100644 (file)
@@ -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");
    }