feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: reduce max puppet start wait time

Browse Source 
Change-Id: I6b68d58ea870a17f9639a9dd174baa9b12ca082e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
This commit is contained in:
Tim Jenssen
2016-10-24 07:29:39 +02:00
parent 280ad90510
commit e83dd17554
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
View File

@@ -141,16 +141,18 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
SLOT(processFinished(int,QProcess::ExitStatus))); 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), connect(m_qmlPuppetEditorProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
m_qmlPuppetEditorProcess.data(), &QProcess::deleteLater); m_qmlPuppetEditorProcess.data(), &QProcess::deleteLater);
if (runModus == NormalModus) { if (runModus == NormalModus) {
m_qmlPuppetPreviewProcess->waitForStarted(); m_qmlPuppetPreviewProcess->waitForStarted(waitConstant / 2);
connect(m_qmlPuppetPreviewProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), connect(m_qmlPuppetPreviewProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
m_qmlPuppetPreviewProcess.data(), &QProcess::deleteLater); 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), connect(m_qmlPuppetRenderProcess.data(), static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
m_qmlPuppetRenderProcess.data(), &QProcess::deleteLater); m_qmlPuppetRenderProcess.data(), &QProcess::deleteLater);
} }
@@ -158,7 +160,7 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
bool connectedToPuppet = true; bool connectedToPuppet = true;
if (!m_localServer->hasPendingConnections()) if (!m_localServer->hasPendingConnections())
connectedToPuppet = m_localServer->waitForNewConnection(3000); connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4);
if (connectedToPuppet) { if (connectedToPuppet) {
m_firstSocket = m_localServer->nextPendingConnection(); m_firstSocket = m_localServer->nextPendingConnection();
@@ -166,14 +168,14 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
if (runModus == NormalModus) { if (runModus == NormalModus) {
if (!m_localServer->hasPendingConnections()) if (!m_localServer->hasPendingConnections())
connectedToPuppet = m_localServer->waitForNewConnection(3000); connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4);
if (connectedToPuppet) { if (connectedToPuppet) {
m_secondSocket = m_localServer->nextPendingConnection(); m_secondSocket = m_localServer->nextPendingConnection();
connect(m_secondSocket.data(), SIGNAL(readyRead()), this, SLOT(readSecondDataStream())); connect(m_secondSocket.data(), SIGNAL(readyRead()), this, SLOT(readSecondDataStream()));
if (!m_localServer->hasPendingConnections()) if (!m_localServer->hasPendingConnections())
connectedToPuppet = m_localServer->waitForNewConnection(3000); connectedToPuppet = m_localServer->waitForNewConnection(waitConstant / 4);
if (connectedToPuppet) { if (connectedToPuppet) {
m_thirdSocket = m_localServer->nextPendingConnection(); m_thirdSocket = m_localServer->nextPendingConnection();