From d33dcac6ca42552b8b0a829d9e465947536d554f Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 24 May 2016 15:50:31 +0200 Subject: [PATCH] QmlProfiler: Fix "Callee" vs "Caller" labels in statistics view Change-Id: I28a134b0ae72bb87ad6849f0f70a5332ec019a50 Reviewed-by: Christian Kandeler --- src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp | 5 +++++ src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h | 2 ++ src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp index 6833e205489..a1262e4b095 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp @@ -394,6 +394,11 @@ void QmlProfilerStatisticsRelativesModel::finalize(const QSet &eventsInBind } } +QmlProfilerStatisticsRelation QmlProfilerStatisticsRelativesModel::relation() const +{ + return m_relation; +} + int QmlProfilerStatisticsRelativesModel::count() const { return m_data.count(); diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h index 6cc357fe68c..0af4c8700ff 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h @@ -124,6 +124,8 @@ public: void loadEvent(const QmlEvent &event); void finalize(const QSet &eventsInBindingLoop); + QmlProfilerStatisticsRelation relation() const; + signals: void dataAvailable(); diff --git a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp index 3bc34f471c3..bca2a6bcbcc 100644 --- a/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerstatisticsview.cpp @@ -914,7 +914,7 @@ void QmlProfilerStatisticsRelativesView::clear() void QmlProfilerStatisticsRelativesView::updateHeader() { - bool calleesView = qobject_cast(d->model) != 0; + bool calleesView = d->model->relation() == QmlProfilerStatisticsChilden; if (treeModel()) { treeModel()->setColumnCount(5);