Commit d20594a7 authored by Marco Bubke's avatar Marco Bubke
Browse files

QmlDesigner.NodeInstances: Better handling of qml puppet problems

Task-number: QTCREATORBUG-4909

Change-Id: I4cad62e379ba66c3ab9eddb2d770f39eb1e07ff8
Reviewed-on: http://codereview.qt.nokia.com/1901

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarThomas Hartmann <Thomas.Hartmann@nokia.com>
parent 94c83143
...@@ -165,37 +165,43 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV ...@@ -165,37 +165,43 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(deleteLater())); connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(deleteLater()));
m_qmlPuppetEditorProcess->waitForStarted(); if (m_qmlPuppetEditorProcess->waitForStarted(10000)) {
connect(m_qmlPuppetEditorProcess.data(), SIGNAL(finished(int)), m_qmlPuppetEditorProcess.data(),SLOT(deleteLater()));
connect(m_qmlPuppetEditorProcess.data(), SIGNAL(finished(int)), m_qmlPuppetEditorProcess.data(),SLOT(deleteLater())); if (runModus == NormalModus) {
m_qmlPuppetPreviewProcess->waitForStarted();
connect(m_qmlPuppetPreviewProcess.data(), SIGNAL(finished(int)), m_qmlPuppetPreviewProcess.data(),SLOT(deleteLater()));
if (runModus == NormalModus) { m_qmlPuppetRenderProcess->waitForStarted();
m_qmlPuppetPreviewProcess->waitForStarted(); connect(m_qmlPuppetRenderProcess.data(), SIGNAL(finished(int)), m_qmlPuppetRenderProcess.data(),SLOT(deleteLater()));
connect(m_qmlPuppetPreviewProcess.data(), SIGNAL(finished(int)), m_qmlPuppetPreviewProcess.data(),SLOT(deleteLater())); }
m_qmlPuppetRenderProcess->waitForStarted(); if (!m_localServer->hasPendingConnections())
connect(m_qmlPuppetRenderProcess.data(), SIGNAL(finished(int)), m_qmlPuppetRenderProcess.data(),SLOT(deleteLater())); m_localServer->waitForNewConnection(10000);
}
if (!m_localServer->hasPendingConnections()) m_firstSocket = m_localServer->nextPendingConnection();
m_localServer->waitForNewConnection(-1); connect(m_firstSocket.data(), SIGNAL(readyRead()), this, SLOT(readFirstDataStream()));
m_firstSocket = m_localServer->nextPendingConnection(); if (runModus == NormalModus) {
connect(m_firstSocket.data(), SIGNAL(readyRead()), this, SLOT(readFirstDataStream())); if (!m_localServer->hasPendingConnections())
m_localServer->waitForNewConnection(10000);
if (runModus == NormalModus) { m_secondSocket = m_localServer->nextPendingConnection();
if (!m_localServer->hasPendingConnections()) connect(m_secondSocket.data(), SIGNAL(readyRead()), this, SLOT(readSecondDataStream()));
m_localServer->waitForNewConnection(-1);
m_secondSocket = m_localServer->nextPendingConnection();
connect(m_secondSocket.data(), SIGNAL(readyRead()), this, SLOT(readSecondDataStream()));
if (!m_localServer->hasPendingConnections()) if (!m_localServer->hasPendingConnections())
m_localServer->waitForNewConnection(-1); m_localServer->waitForNewConnection(10000);
m_thirdSocket = m_localServer->nextPendingConnection(); m_thirdSocket = m_localServer->nextPendingConnection();
connect(m_thirdSocket.data(), SIGNAL(readyRead()), this, SLOT(readThirdDataStream())); connect(m_thirdSocket.data(), SIGNAL(readyRead()), this, SLOT(readThirdDataStream()));
}
} else {
QMessageBox::warning(0, tr("Cannot Start QML Puppet Executable"),
tr("The executable of the QML Puppet process (%1) cannot be started. "
"Please check your installation. "
"QML Puppet is a process which runs in the background to render the items.").
arg(applicationPath));
} }
m_localServer->close(); m_localServer->close();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment