diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2016-07-04 18:54:51 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-07-05 08:08:09 +0000 |
| commit | 80e6bf1ef5e40033f71c9d5e95893fa285fd4ee3 (patch) | |
| tree | ca818ee3262aadfebeb0759fc8ba63c7b2901c1f /src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp | |
| parent | 51055e6799fad5685d4f53e742aa6038f5e0c137 (diff) | |
QmlProfiler: Terminate waiting processes when Complete arrives
Previously, in AppStopRequested state we would wait until we are done
processing the data. This is problematic as when aggregating traces
this doesn't happen spontaneously. If we've explicitly asked the
process to terminate it's safe to do so after receiving Complete as
we won't need any more data after this.
Change-Id: I64111ce6039ffc7f6815425c6b7e4432ac528c86
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp index 31e72dcaeb..03d5b10f97 100644 --- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp @@ -346,6 +346,8 @@ void QmlProfilerClientManager::retryMessageBoxFinished(int result) void QmlProfilerClientManager::qmlComplete(qint64 maximumTime) { + if (d->profilerState->currentState() == QmlProfilerStateManager::AppStopRequested) + d->profilerState->setCurrentState(QmlProfilerStateManager::Idle); d->modelManager->traceTime()->increaseEndTime(maximumTime); if (d->modelManager && !d->aggregateTraces) d->modelManager->acquiringDone(); |