From a7098c69c1f6aeb915fb1c90a4476e094900a136 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 6 Jan 2011 18:06:57 +0100 Subject: [PATCH] QmlDesigner.NodeInstances: Change puppet to raster --- .../qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp | 2 +- src/tools/qmlpuppet/main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index 65121d31cc..7ff1342785 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -51,7 +51,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV m_qmlPuppetProcess = new QProcess(QCoreApplication::instance()); connect(m_qmlPuppetProcess.data(), SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(processFinished(int,QProcess::ExitStatus))); m_qmlPuppetProcess->setProcessChannelMode(QProcess::ForwardedChannels); - m_qmlPuppetProcess->start(QString("%1/%2").arg(QCoreApplication::applicationDirPath()).arg("qmlpuppet"), QStringList() << socketToken); + m_qmlPuppetProcess->start(QString("%1/%2").arg(QCoreApplication::applicationDirPath()).arg("qmlpuppet"), QStringList() << socketToken << "-graphicssystem raster"); connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(deleteLater())); m_qmlPuppetProcess->waitForStarted(); Q_ASSERT(m_qmlPuppetProcess->state() == QProcess::Running); diff --git a/src/tools/qmlpuppet/main.cpp b/src/tools/qmlpuppet/main.cpp index a383bd7adb..f96ab533af 100644 --- a/src/tools/qmlpuppet/main.cpp +++ b/src/tools/qmlpuppet/main.cpp @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) { QApplication application(argc, argv); - if (application.arguments().count() != 2) + if (application.arguments().count() != 3) return -1; QCoreApplication::setOrganizationName("Nokia"); -- 2.11.0