diff options
| author | Ulf Hermann <[email protected]> | 2016-11-23 16:47:04 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2016-11-23 16:12:51 +0000 |
| commit | 824f5f443a0b56cb675250ede0706e10e7ad2bce (patch) | |
| tree | 7f04eee23ce582300a962cbdf84166cbbed08e27 /src/plugins/qmlprofiler/qmlprofilertraceview.cpp | |
| parent | 2ed5d7998aa03358674de56ad407f57579d0fdb9 (diff) | |
Timeline: Use the same type for setting and getting a model list
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 <[email protected]>
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilertraceview.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index e50c4d82947..bf676a4968a 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -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 |