From 71375b3c35b82bcaec6823eb6b2029a97bcb7f8c Mon Sep 17 00:00:00 2001 From: Christiaan Janssen Date: Wed, 31 Jul 2013 17:14:55 +0200 Subject: QmlProfiler: fixed bug in status completion Change-Id: I01b99f3c14d359be1d3e1bd85df01f6c823a1cab Reviewed-by: Christian Stenger Reviewed-by: Kai Koehne --- plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp | 2 +- plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp | 2 +- plugins/qmlprofiler/qmlprofilerprocessedmodel.cpp | 1 + plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp | 2 +- plugins/qmlprofilerextension/pixmapcachemodel.cpp | 2 +- plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp b/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp index a493349b1c8..d1be7cfdb38 100644 --- a/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp +++ b/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp @@ -96,7 +96,7 @@ void QmlProfilerEventsModelProxy::limitToRange(qint64 rangeStart, qint64 rangeEn void QmlProfilerEventsModelProxy::dataChanged() { - if (d->modelManager->state() == QmlProfilerDataState::Done) + if (d->modelManager->state() == QmlProfilerDataState::ProcessingData) loadData(); if (d->modelManager->state() == QmlProfilerDataState::Empty) diff --git a/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp b/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp index 802a84a515f..9db131f7712 100644 --- a/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp +++ b/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp @@ -120,7 +120,7 @@ void PaintEventsModelProxy::clear() void PaintEventsModelProxy::dataChanged() { - if (m_modelManager->state() == QmlProfilerDataState::Done) + if (m_modelManager->state() == QmlProfilerDataState::ProcessingData) loadData(); if (m_modelManager->state() == QmlProfilerDataState::Empty) diff --git a/plugins/qmlprofiler/qmlprofilerprocessedmodel.cpp b/plugins/qmlprofiler/qmlprofilerprocessedmodel.cpp index f79556a0e9a..2e4331f735e 100644 --- a/plugins/qmlprofiler/qmlprofilerprocessedmodel.cpp +++ b/plugins/qmlprofiler/qmlprofilerprocessedmodel.cpp @@ -155,6 +155,7 @@ void QmlProfilerProcessedModel::complete() m_detailsRewriter->reloadDocuments(); + QmlProfilerSimpleModel::complete(); emit changed(); m_emitChanged = false; } diff --git a/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp b/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp index c7943da3f65..e6a280aadd2 100644 --- a/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp +++ b/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp @@ -132,7 +132,7 @@ void BasicTimelineModel::clear() void BasicTimelineModel::dataChanged() { - if (m_modelManager->state() == QmlProfilerDataState::Done) + if (m_modelManager->state() == QmlProfilerDataState::ProcessingData) loadData(); if (m_modelManager->state() == QmlProfilerDataState::Empty) diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index ce1969e3a45..033865969ae 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -483,7 +483,7 @@ void PixmapCacheModel::clear() void PixmapCacheModel::dataChanged() { - if (m_modelManager->state() == QmlProfilerDataState::Done) + if (m_modelManager->state() == QmlProfilerDataState::ProcessingData) loadData(); if (m_modelManager->state() == QmlProfilerDataState::Empty) diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 814de70787e..129419e16b5 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -476,7 +476,7 @@ void SceneGraphTimelineModel::clear() void SceneGraphTimelineModel::dataChanged() { - if (m_modelManager->state() == QmlProfilerDataState::Done) + if (m_modelManager->state() == QmlProfilerDataState::ProcessingData) loadData(); if (m_modelManager->state() == QmlProfilerDataState::Empty) -- cgit v1.2.3