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

QmlProfiler: Use stop dependencies for RunWorkers

Browse Source 
Change-Id: If4d0af85c6e537e6d9a35dc877f7542c91a2bc13
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Ulf Hermann
2017-08-08 15:11:23 +02:00
parent a028f6717f
commit ff9e55d5fb
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
View File

@@ -133,7 +133,7 @@ void QmlProfilerRunner::stop()
switch (d->m_profilerState->currentState()) { switch (d->m_profilerState->currentState()) {
case QmlProfilerStateManager::AppRunning: case QmlProfilerStateManager::AppRunning:
d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopRequested); d->m_profilerState->setCurrentState(QmlProfilerStateManager::AppStopRequested);
break; return; // Don't reportStopped() here. We are still waiting for data.
case QmlProfilerStateManager::AppStopRequested: case QmlProfilerStateManager::AppStopRequested:
// Pressed "stop" a second time. Kill the application without collecting data // Pressed "stop" a second time. Kill the application without collecting data
d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle); d->m_profilerState->setCurrentState(QmlProfilerStateManager::Idle);
@@ -257,6 +257,7 @@ void QmlProfilerRunner::profilerStateChanged()
switch (d->m_profilerState->currentState()) { switch (d->m_profilerState->currentState()) {
case QmlProfilerStateManager::Idle: case QmlProfilerStateManager::Idle:
d->m_noDebugOutputTimer.stop(); d->m_noDebugOutputTimer.stop();
reportStopped();
break; break;
default: default:
break; break;
@@ -309,6 +310,7 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(RunControl *runControl, const Q
m_profiler = new QmlProfilerRunner(runControl); m_profiler = new QmlProfilerRunner(runControl);
m_profiler->setServerUrl(serverUrl); m_profiler->setServerUrl(serverUrl);
m_profiler->addStartDependency(this); m_profiler->addStartDependency(this);
addStopDependency(m_profiler);
StandardRunnable debuggee = runnable().as<StandardRunnable>(); StandardRunnable debuggee = runnable().as<StandardRunnable>();
QString arguments = QmlDebug::qmlDebugArguments(QmlDebug::QmlProfilerServices, serverUrl); QString arguments = QmlDebug::qmlDebugArguments(QmlDebug::QmlProfilerServices, serverUrl);
@@ -322,6 +324,7 @@ LocalQmlProfilerSupport::LocalQmlProfilerSupport(RunControl *runControl, const Q
m_profilee = new SimpleTargetRunner(runControl); m_profilee = new SimpleTargetRunner(runControl);
m_profilee->setRunnable(debuggee); m_profilee->setRunnable(debuggee);
addStartDependency(m_profilee); addStartDependency(m_profilee);
m_profilee->addStopDependency(this);
} }
void LocalQmlProfilerSupport::start() void LocalQmlProfilerSupport::start()