diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp index 7597cc8e5865e405a34d4db2acfe4bed678601a7..2fa63948c5a7a8666c434126c2ae591c9ebe4cd8 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel.cpp +++ b/src/plugins/qmlprofiler/abstracttimelinemodel.cpp @@ -190,12 +190,6 @@ qint64 AbstractTimelineModel::traceDuration() const return d->modelManager->traceTime()->duration(); } -int AbstractTimelineModel::getState() const -{ - Q_D(const AbstractTimelineModel); - return (int)d->modelManager->state(); -} - const QVariantMap AbstractTimelineModel::getEventLocation(int index) const { Q_UNUSED(index); diff --git a/src/plugins/qmlprofiler/abstracttimelinemodel.h b/src/plugins/qmlprofiler/abstracttimelinemodel.h index 360118179a9e3b4643ab6a1f2321b55b600c5768..7fae5adb38e4c6362fe9ee4c4a705fd84f6d5092 100644 --- a/src/plugins/qmlprofiler/abstracttimelinemodel.h +++ b/src/plugins/qmlprofiler/abstracttimelinemodel.h @@ -62,7 +62,6 @@ public: Q_INVOKABLE qint64 traceStartTime() const; Q_INVOKABLE qint64 traceEndTime() const; Q_INVOKABLE qint64 traceDuration() const; - Q_INVOKABLE int getState() const; Q_INVOKABLE qint64 getDuration(int index) const; Q_INVOKABLE qint64 getStartTime(int index) const; Q_INVOKABLE qint64 getEndTime(int index) const; diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml index d9c60d08396e91e07ed71eeb542fbc97ac4e31ec..4059bf640f7c530f5c02af81e0191db980f4b4ed 100644 --- a/src/plugins/qmlprofiler/qml/MainView.qml +++ b/src/plugins/qmlprofiler/qml/MainView.qml @@ -76,12 +76,6 @@ Rectangle { Connections { target: qmlProfilerModelProxy - onStateChanged: { - // Clear if model is empty. - if (qmlProfilerModelProxy.getState() === 0) - root.clear(); - backgroundMarks.requestPaint() - } onDataAvailable: { view.clearData(); zoomControl.setRange(qmlProfilerModelProxy.traceStartTime(), @@ -89,6 +83,7 @@ Rectangle { qmlProfilerModelProxy.traceDuration()/10); view.requestPaint(); } + onStateChanged: backgroundMarks.requestPaint() onExpandedChanged: backgroundMarks.requestPaint() onRowHeightChanged: backgroundMarks.requestPaint() } diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp index 8744892455d45c24f18dd28a924a7acdb3734f3b..19111dd64f22050d0c33dae89791203706c9864d 100644 --- a/src/plugins/qmlprofiler/timelinemodelaggregator.cpp +++ b/src/plugins/qmlprofiler/timelinemodelaggregator.cpp @@ -286,11 +286,5 @@ qint64 TimelineModelAggregator::traceDuration() const return d->modelManager->traceTime()->duration(); } -int TimelineModelAggregator::getState() const -{ - return (int)d->modelManager->state(); -} - - } // namespace Internal } // namespace QmlProfiler diff --git a/src/plugins/qmlprofiler/timelinemodelaggregator.h b/src/plugins/qmlprofiler/timelinemodelaggregator.h index 90a18fc198a4fa6de4aaceb4adbe4eca823e8755..cfb6f6f0dea0534bbfb4f16438d84ceb9b70be95 100644 --- a/src/plugins/qmlprofiler/timelinemodelaggregator.h +++ b/src/plugins/qmlprofiler/timelinemodelaggregator.h @@ -54,7 +54,6 @@ public: Q_INVOKABLE qint64 traceStartTime() const; Q_INVOKABLE qint64 traceEndTime() const; Q_INVOKABLE qint64 traceDuration() const; - Q_INVOKABLE int getState() const; bool isEmpty() const;