QmlProfiler: fix SceneGraph profiling

Change-Id: I54c960f0b0da061816223a51795c83a9f9dd3f66
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

diff --git a/src/qml/debugger/qqmlprofilerservice.cpp b/src/qml/debugger/qqmlprofilerservice.cpp
index 963a861..0ba939c 100644 (file)
--- 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 c4a9328..bd69fd5 100644 (file)
--- 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
 }

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 21fc481..e4f886f 100644 (file)
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -283,7 +283,7 @@ void QQmlProfilerClient::messageReceived(const QByteArray &message)
         case QQmlProfilerClient::SceneGraphWindowsRenderShow: stream >> subtime_1 >> subtime_2 >> subtime_3; break;
             // WindowsAnimations: update time
         case QQmlProfilerClient::SceneGraphWindowsAnimations: stream >> subtime_1; break;
-            // WindowsRenderWindow: polish time, sync time, render time, swap time
+            // WindowsRenderWindow: polish time
         case QQmlProfilerClient::SceneGraphWindowsPolishFrame: stream >> subtime_1; break;
         }
         break;