aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@digia.com>2013-05-24 16:07:13 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-27 14:36:06 +0200
commit8f8d8dde3cde7ed2bcf6af9e85f40ee551eaafce (patch)
tree79f6770f16f7fffca85dc9bc07fdbe8988220dde /src
parent2653e79f1822dfa3c1516f518df77e94adf8bf82 (diff)
QmlProfiler: fix SceneGraph profiling
Change-Id: I54c960f0b0da061816223a51795c83a9f9dd3f66 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/debugger/qqmlprofilerservice.cpp2
-rw-r--r--src/quick/scenegraph/qsgthreadedrenderloop.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmlprofilerservice.cpp b/src/qml/debugger/qqmlprofilerservice.cpp
index 963a861821..0ba939cdca 100644
--- a/src/qml/debugger/qqmlprofilerservice.cpp
+++ b/src/qml/debugger/qqmlprofilerservice.cpp
@@ -105,7 +105,7 @@ QByteArray QQmlProfilerData::toByteArray() const
case QQmlProfilerService::SceneGraphWindowsRenderShow: ds << subtime_1 << subtime_2 << subtime_3; break;
// WindowsAnimations: update time
case QQmlProfilerService::SceneGraphWindowsAnimations: ds << subtime_1; break;
- // WindowsRenderWindow: polish time, sync time, render time, swap time
+ // WindowsRenderWindow: polish time
case QQmlProfilerService::SceneGraphWindowsPolishFrame: ds << subtime_1; break;
default:break;
}
diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index c4a9328ceb..bd69fd5464 100644
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -1032,7 +1032,7 @@ void QSGThreadedRenderLoop::polishAndSync()
polishTime,
waitTime - polishTime,
syncTime - waitTime,
- timer.elapsed() - syncTime);
+ timer.nsecsElapsed() - syncTime);
}
#endif
}