From 5d6c9ba2e993bc52540a67a84920e81029c61528 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 15 Jun 2015 18:35:49 +0200 Subject: [PATCH] QmlProfiler: Always try to connect immediately if we know the port Waiting for the debug output is not necessary in most cases because we tell the application which port to listen on anyway. QmlProfilerClientManager will retry 50 times and then prompt the user to decide if even more tries are necessary. This should be enough to establish a connection. As a side effect, this removes the only place where AnalyzerStartParameters::startMode is used in the QML profiler. Change-Id: I40991b34c98d93b0874d627fba3dae7ccfabaf2c Task-number: QTCREATORBUG-13510 Reviewed-by: Joerg Bornemann Reviewed-by: David Schulz --- src/plugins/qmlprofiler/qmlprofilerengine.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerengine.cpp b/src/plugins/qmlprofiler/qmlprofilerengine.cpp index 991b291dbed..360f470a71e 100644 --- a/src/plugins/qmlprofiler/qmlprofilerengine.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerengine.cpp @@ -113,10 +113,10 @@ bool QmlProfilerRunControl::startEngine() d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStarting); - if (startParameters().useStartupProject) - d->m_noDebugOutputTimer.start(); - else if (startParameters().analyzerPort != 0) + if (startParameters().analyzerPort != 0) emit processRunning(startParameters().analyzerPort); + else + d->m_noDebugOutputTimer.start(); d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppRunning); engineStarted();