feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: I4332eba9f1f66fef185359c79c4d96420d8b78ca
This commit is contained in:
Eike Ziller
2018-08-30 08:31:25 +02:00
parent db85693690 8ef4964168
commit 8e05783019
18 changed files with 358 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -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;