diff --git a/src/libs/timeline/timelineabstractrenderer.cpp b/src/libs/timeline/timelineabstractrenderer.cpp index e1860f6d204..4b9f775c3b5 100644 --- a/src/libs/timeline/timelineabstractrenderer.cpp +++ b/src/libs/timeline/timelineabstractrenderer.cpp @@ -106,7 +106,7 @@ void TimelineAbstractRenderer::setModel(TimelineModel *model) disconnect(d->model, &TimelineModel::hiddenChanged, this, &QQuickItem::update); disconnect(d->model, &TimelineModel::expandedRowHeightChanged, this, &TimelineAbstractRenderer::setRowHeightsDirty); - disconnect(d->model, &TimelineModel::emptyChanged, + disconnect(d->model, &TimelineModel::contentChanged, this, &TimelineAbstractRenderer::setModelDirty); } @@ -116,7 +116,7 @@ void TimelineAbstractRenderer::setModel(TimelineModel *model) connect(d->model, &TimelineModel::hiddenChanged, this, &QQuickItem::update); connect(d->model, &TimelineModel::expandedRowHeightChanged, this, &TimelineAbstractRenderer::setRowHeightsDirty); - connect(d->model, &TimelineModel::emptyChanged, + connect(d->model, &TimelineModel::contentChanged, this, &TimelineAbstractRenderer::setModelDirty); d->renderPasses = d->model->supportedRenderPasses(); } diff --git a/src/libs/timeline/timelinemodel.cpp b/src/libs/timeline/timelinemodel.cpp index d11fef6deac..62e94d7b45e 100644 --- a/src/libs/timeline/timelinemodel.cpp +++ b/src/libs/timeline/timelinemodel.cpp @@ -576,7 +576,7 @@ void TimelineModel::clear() if (hadRowHeights) emit expandedRowHeightChanged(-1, -1); if (!wasEmpty) { - emit emptyChanged(); + emit contentChanged(); emit heightChanged(); } } diff --git a/src/libs/timeline/timelinemodel.h b/src/libs/timeline/timelinemodel.h index acf40f7a724..dc295f788b0 100644 --- a/src/libs/timeline/timelinemodel.h +++ b/src/libs/timeline/timelinemodel.h @@ -37,15 +37,15 @@ class TIMELINE_EXPORT TimelineModel : public QObject Q_OBJECT Q_PROPERTY(int modelId READ modelId CONSTANT) Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName NOTIFY displayNameChanged) - Q_PROPERTY(bool empty READ isEmpty NOTIFY emptyChanged) + Q_PROPERTY(bool empty READ isEmpty NOTIFY contentChanged) Q_PROPERTY(bool hidden READ hidden WRITE setHidden NOTIFY hiddenChanged) Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged) Q_PROPERTY(int height READ height NOTIFY heightChanged) Q_PROPERTY(int expandedRowCount READ expandedRowCount NOTIFY expandedRowCountChanged) Q_PROPERTY(int collapsedRowCount READ collapsedRowCount NOTIFY collapsedRowCountChanged) Q_PROPERTY(int rowCount READ rowCount NOTIFY rowCountChanged) - Q_PROPERTY(QVariantList labels READ labels NOTIFY labelsChanged) - Q_PROPERTY(int count READ count NOTIFY emptyChanged) + Q_PROPERTY(QVariantList labels READ labels NOTIFY contentChanged) + Q_PROPERTY(int count READ count NOTIFY contentChanged) Q_PROPERTY(int defaultRowHeight READ defaultRowHeight CONSTANT) public: @@ -115,12 +115,11 @@ signals: void expandedChanged(); void hiddenChanged(); void expandedRowHeightChanged(int row, int height); - void emptyChanged(); + void contentChanged(); void heightChanged(); void expandedRowCountChanged(); void collapsedRowCountChanged(); void rowCountChanged(); - void labelsChanged(); void displayNameChanged(); protected: diff --git a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp index 605ced1fb77..fe4f00ba3e7 100644 --- a/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertimelinemodel.cpp @@ -92,19 +92,17 @@ void QmlProfilerTimelineModel::announceFeatures(quint64 features) void QmlProfilerTimelineModel::dataChanged() { - switch (m_modelManager->state()) { case QmlProfilerModelManager::Done: - emit emptyChanged(); + emit contentChanged(); break; case QmlProfilerModelManager::ClearingData: clear(); break; default: + emit contentChanged(); break; } - - emit labelsChanged(); } void QmlProfilerTimelineModel::onVisibleFeaturesChanged(quint64 features) diff --git a/tests/auto/timeline/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp b/tests/auto/timeline/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp index 2e0484bcb9c..c7049c27bc2 100644 --- a/tests/auto/timeline/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp +++ b/tests/auto/timeline/timelineoverviewrenderer/tst_timelineoverviewrenderer.cpp @@ -42,7 +42,7 @@ public: setExpandedRowCount(3); for (int i = 0; i < 10; ++i) insert(i, i, i); - emit emptyChanged(); + emit contentChanged(); } }; diff --git a/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp b/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp index 6087483fec3..f2a88005e09 100644 --- a/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp +++ b/tests/auto/timeline/timelinerenderer/tst_timelinerenderer.cpp @@ -45,7 +45,7 @@ public: for (int i = 0; i < 10; ++i) insert(i, 10 - i, i); computeNesting(); - emit emptyChanged(); + emit contentChanged(); } };