diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2016-10-24 07:29:39 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2016-10-24 20:37:26 +0000 |
| commit | e83dd1755446134c94537b9d98b193faf9a8260f (patch) | |
| tree | 7807bdafc5ef4d77d36517f172d3dee04c99c8ac | |
| parent | 280ad905109754cad3940334e5a46e4969883ea7 (diff) | |
| download | qt-creator-e83dd1755446134c94537b9d98b193faf9a8260f.tar.gz | |
QmlDesigner: reduce max puppet start wait time
Change-Id: I6b68d58ea870a17f9639a9dd174baa9b12ca082e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp index 819f39e824..f507fb8361 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp @@ -141,16 +141,18 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV SLOT(processFinished(int,QProcess::ExitStatus))); } - if (m_qmlPuppetEditorProcess->waitForStarted(10000)) { + const int second = 1000; + const int waitConstant = 8 * second; + if (m_qmlPuppetEditorProcess->waitForStarted(waitConstant)) { connect(m_qmlPuppetEditorProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), m_qmlPuppetEditorProcess.data(), &QProcess::deleteLater); if (runModus == NormalModus) { - m_qmlPuppetPreviewProcess->waitForStarted(); + m_qmlPuppetPreviewProcess->waitForStarted(waitConstant / 2); connect(m_qmlPuppetPreviewProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), m_qmlPuppetPreviewProcess.data(), &QProcess::deleteLater); - m_qmlPuppetRenderProcess->waitForStarted(); + m_qmlPuppetRenderProcess->waitForStarted(waitConstant / 2); connect(m_qmlPuppetRenderProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), m_qmlPuppetRenderProcess.data(), &QProcess::deleteLater); } @@ -158,7 +160,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV bool connectedToPuppet = true; if (!m_localServer->hasPendingConnections()) - connectedToPuppet = m_localServer->waitForNewConnection(3000); + connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4); if (connectedToPuppet) { m_firstSocket = m_localServer->nextPendingConnection(); @@ -166,14 +168,14 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV if (runModus == NormalModus) { if (!m_localServer->hasPendingConnections()) - connectedToPuppet = m_localServer->waitForNewConnection(3000); + connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4); if (connectedToPuppet) { m_secondSocket = m_localServer->nextPendingConnection(); connect(m_secondSocket.data(), SIGNAL(readyRead()), this, SLOT(readSecondDataStream())); if (!m_localServer->hasPendingConnections()) - connectedToPuppet = m_localServer->waitForNewConnection(3000); + connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4); if (connectedToPuppet) { m_thirdSocket = m_localServer->nextPendingConnection(); |