aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprofiler
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-08-30 08:31:25 +0200
committerEike Ziller <eike.ziller@qt.io>2018-08-30 08:31:25 +0200
commit8e05783019da7979b6b54768334870105c86a4be (patch)
tree3b87a6f2e20e3e606bda992df1e9557f5f0b41df /src/plugins/qmlprofiler
parentdb85693690dd85ee77def8b5bc6f4b4a0de265f5 (diff)
parent8ef4964168ccca6153cd9dbfc631043d8293e370 (diff)
Merge remote-tracking branch 'origin/4.7'
Diffstat (limited to 'src/plugins/qmlprofiler')
-rw-r--r--src/plugins/qmlprofiler/qmlprofilertraceview.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index 7e7d77bfb9..50f6030d0f 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -145,7 +145,8 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
setLayout(groupLayout);
d->m_viewContainer = container;
- d->m_modelProxy = new Timeline::TimelineModelAggregator(modelManager->notesModel(), this);
+ d->m_modelProxy = new Timeline::TimelineModelAggregator(this);
+ d->m_modelProxy->setNotes(modelManager->notesModel());
d->m_modelManager = modelManager;
QVariantList models;