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

Timeline: Use the same type for setting and getting a model list

Browse Source 
We want to use QVariantList here because that is the only list type we
can pass to QML without special registration.

Change-Id: Ia57f8f0c578388da7603ddb6d62288e9cf61e381
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2016-11-23 16:47:04 +01:00
parent 2ed5d7998a
commit 824f5f443a
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,15 +130,18 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
d->m_modelProxy = new Timeline::TimelineModelAggregator(modelManager->notesModel(), this);
d->m_modelManager = modelManager;
QList<Timeline::TimelineModel *> models;
models.append(new PixmapCacheModel(modelManager, d->m_modelProxy));
models.append(new SceneGraphTimelineModel(modelManager, d->m_modelProxy));
models.append(new MemoryUsageModel(modelManager, d->m_modelProxy));
models.append(new InputEventsModel(modelManager, d->m_modelProxy));
models.append(new DebugMessagesModel(modelManager, d->m_modelProxy));
models.append(new QmlProfilerAnimationsModel(modelManager, d->m_modelProxy));
for (int i = 0; i < MaximumRangeType; ++i)
models.append(new QmlProfilerRangeModel(modelManager, (RangeType)i, d->m_modelProxy));
QVariantList models;
models.append(QVariant::fromValue(new PixmapCacheModel(modelManager, d->m_modelProxy)));
models.append(QVariant::fromValue(new SceneGraphTimelineModel(modelManager, d->m_modelProxy)));
models.append(QVariant::fromValue(new MemoryUsageModel(modelManager, d->m_modelProxy)));
models.append(QVariant::fromValue(new InputEventsModel(modelManager, d->m_modelProxy)));
models.append(QVariant::fromValue(new DebugMessagesModel(modelManager, d->m_modelProxy)));
models.append(QVariant::fromValue(new QmlProfilerAnimationsModel(modelManager,
d->m_modelProxy)));
for (int i = 0; i < MaximumRangeType; ++i) {
models.append(QVariant::fromValue(new QmlProfilerRangeModel(modelManager, (RangeType)i,
d->m_modelProxy)));
}
d->m_modelProxy->setModels(models);
// Minimum height: 5 rows of 20 pixels + scrollbar of 50 pixels + 20 pixels margin