diff options
author | Ulf Hermann <ulf.hermann@digia.com> | 2014-06-06 16:37:47 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@digia.com> | 2014-06-16 13:06:00 +0300 |
commit | 3c5b2dd704de1b4897b77d0e2615569d3f278250 (patch) | |
tree | fbb1261ecc7b0a119df1c786a4670fa2a484a6fe | |
parent | 4a95af3b7f4a7eb148dedefb77ea053b2f559f65 (diff) |
Adapt to changes in event type definitions
Change-Id: If105f490a02ffabe07d2b4871c655972445c6a19
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
-rw-r--r-- | plugins/qmlprofilerextension/pixmapcachemodel.cpp | 5 | ||||
-rw-r--r-- | plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp index f329963449..fd199cab23 100644 --- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp +++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp @@ -85,7 +85,8 @@ private: PixmapCacheModel::PixmapCacheModel(QObject *parent) : SingleCategoryTimelineModel(new PixmapCacheModelPrivate(), QLatin1String("PixmapCacheTimeLineModel"), - QLatin1String("Pixmap Cache"), QmlDebug::PixmapCacheEvent, parent) + QLatin1String("Pixmap Cache"), QmlDebug::PixmapCacheEvent, + QmlDebug::MaximumRangeType, parent) { Q_D(PixmapCacheModel); d->collapsedRowCount = 1; @@ -278,7 +279,7 @@ void PixmapCacheModel::loadData() continue; PixmapCacheEvent newEvent; - newEvent.pixmapEventType = event.bindingType; + newEvent.pixmapEventType = event.detailType; qint64 startTime = event.startTime; newEvent.urlIndex = -1; diff --git a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp index 584186c0ac..c4153fb740 100644 --- a/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp +++ b/plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp @@ -65,7 +65,7 @@ private: SceneGraphTimelineModel::SceneGraphTimelineModel(QObject *parent) : SingleCategoryTimelineModel(new SceneGraphTimelineModelPrivate, QLatin1String("SceneGraphTimeLineModel"), tr("Scene Graph"), - QmlDebug::SceneGraphFrameEvent, parent) + QmlDebug::SceneGraphFrame, QmlDebug::MaximumRangeType, parent) { } @@ -206,7 +206,7 @@ void SceneGraphTimelineModel::loadData() if (!eventAccepted(event)) continue; - if (event.bindingType == SceneGraphRenderLoopFrame) { + if (event.detailType == SceneGraphRenderLoopFrame) { SceneGraphEvent newEvent; newEvent.sgEventType = SceneGraphRenderThread; qint64 duration = event.numericData1 + event.numericData2 + event.numericData3; @@ -221,7 +221,7 @@ void SceneGraphTimelineModel::loadData() if (lastRenderEvent >= 0) { qint64 *timing = d->data(lastRenderEvent).timing; - switch ((SceneGraphEventType)event.bindingType) { + switch ((SceneGraphEventType)event.detailType) { case SceneGraphRendererFrame: { timing[1] = event.numericData1; timing[10] = event.numericData2; |