diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2018-03-27 15:58:43 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-04-17 09:13:04 +0000 |
commit | 1ccd058bdfbd6334dfe09d23ac85b7de0cfa1ff1 (patch) | |
tree | 3bf27e06aa47f261985c746ca5d4253b49fd2777 /src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp | |
parent | 72e0a6fec5f451650dcec242378dfdb850e5df89 (diff) | |
download | qt-creator-1ccd058bdfbd6334dfe09d23ac85b7de0cfa1ff1.tar.gz |
QmlProfiler: Get rid of processing step
The child models are made aware of possible changes in the details
strings, and in turn, we can do the finalization immediately after
acquiring is done.
Change-Id: Ibe57f158e64e5d01d4c97aa617c9b2bcc8e4e96e
Task-number: QTCREATORBUG-20106
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp')
-rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp b/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp index c866f9e6ee..1244d3cf72 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatewidget.cpp @@ -132,10 +132,7 @@ void QmlProfilerStateWidget::updateDisplay() } } else if (!d->m_modelManager->isEmpty()) { // When datamodel is acquiring or processing data - if (state == QmlProfilerModelManager::ProcessingData) { - showText(tr("Processing data: %1 / %2").arg(d->m_modelManager->numFinishedFinalizers()) - .arg(d->m_modelManager->numRegisteredFinalizers())); - } else if (d->m_profilerState->currentState() != QmlProfilerStateManager::Idle) { + if (d->m_profilerState->currentState() != QmlProfilerStateManager::Idle) { if (state == QmlProfilerModelManager::AcquiringData) { // we don't know how much more, so progress numbers are strange here showText(tr("Loading buffered data: %n events", 0, @@ -165,12 +162,11 @@ void QmlProfilerStateWidget::update() { QmlProfilerModelManager::State state = d->m_modelManager ? d->m_modelManager->state() : QmlProfilerModelManager::Empty; - if (state == QmlProfilerModelManager::AcquiringData - || state == QmlProfilerModelManager::ProcessingData) { + if (state == QmlProfilerModelManager::AcquiringData) d->timer.start(); - } else { + else d->timer.stop(); - } + updateDisplay(); } |