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

Adapt to changes in event type definitions

Browse Source 
Change-Id: If105f490a02ffabe07d2b4871c655972445c6a19
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-06-06 16:37:47 +02:00
parent 4a95af3b7f
commit 3c5b2dd704
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/qmlprofilerextension/pixmapcachemodel.cpp
View File

@@ -85,7 +85,8 @@ private:
PixmapCacheModel::PixmapCacheModel(QObject *parent) PixmapCacheModel::PixmapCacheModel(QObject *parent)
: SingleCategoryTimelineModel(new PixmapCacheModelPrivate(), : SingleCategoryTimelineModel(new PixmapCacheModelPrivate(),
QLatin1String("PixmapCacheTimeLineModel"), QLatin1String("PixmapCacheTimeLineModel"),
QLatin1String("Pixmap Cache"), QmlDebug::PixmapCacheEvent, parent) QLatin1String("Pixmap Cache"), QmlDebug::PixmapCacheEvent,
QmlDebug::MaximumRangeType, parent)
{ {
Q_D(PixmapCacheModel); Q_D(PixmapCacheModel);
d->collapsedRowCount = 1; d->collapsedRowCount = 1;
@@ -278,7 +279,7 @@ void PixmapCacheModel::loadData()
continue; continue;
PixmapCacheEvent newEvent; PixmapCacheEvent newEvent;
newEvent.pixmapEventType = event.bindingType; newEvent.pixmapEventType = event.detailType;
qint64 startTime = event.startTime; qint64 startTime = event.startTime;
newEvent.urlIndex = -1; newEvent.urlIndex = -1;

6
plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
View File

@@ -65,7 +65,7 @@ private:
SceneGraphTimelineModel::SceneGraphTimelineModel(QObject *parent) SceneGraphTimelineModel::SceneGraphTimelineModel(QObject *parent)
: SingleCategoryTimelineModel(new SceneGraphTimelineModelPrivate, : SingleCategoryTimelineModel(new SceneGraphTimelineModelPrivate,
QLatin1String("SceneGraphTimeLineModel"), tr("Scene Graph"), QLatin1String("SceneGraphTimeLineModel"), tr("Scene Graph"),
QmlDebug::SceneGraphFrameEvent, parent) QmlDebug::SceneGraphFrame, QmlDebug::MaximumRangeType, parent)
{ {
} }
@@ -206,7 +206,7 @@ void SceneGraphTimelineModel::loadData()
if (!eventAccepted(event)) if (!eventAccepted(event))
continue; continue;
if (event.bindingType == SceneGraphRenderLoopFrame) { if (event.detailType == SceneGraphRenderLoopFrame) {
SceneGraphEvent newEvent; SceneGraphEvent newEvent;
newEvent.sgEventType = SceneGraphRenderThread; newEvent.sgEventType = SceneGraphRenderThread;
qint64 duration = event.numericData1 + event.numericData2 + event.numericData3; qint64 duration = event.numericData1 + event.numericData2 + event.numericData3;
@@ -221,7 +221,7 @@ void SceneGraphTimelineModel::loadData()
if (lastRenderEvent >= 0) { if (lastRenderEvent >= 0) {
qint64 *timing = d->data(lastRenderEvent).timing; qint64 *timing = d->data(lastRenderEvent).timing;
switch ((SceneGraphEventType)event.bindingType) { switch ((SceneGraphEventType)event.detailType) {
case SceneGraphRendererFrame: { case SceneGraphRendererFrame: {
timing[1] = event.numericData1; timing[1] = event.numericData1;
timing[10] = event.numericData2; timing[10] = event.numericData2;