From 5977fbfd16f4d2d268dfecc48b1120a1f0dcf004 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 7 Mar 2014 16:20:23 +0100 Subject: Register animation profiler callback also from render thread The QUnifiedTimer in the GUI thread doesn't cover the render thread animations. We need a separate registration for those. We also need to keep track of which animation events are coming from which threads. Task-number: QTCREATORBUG-11659 Change-Id: I1fdd80a5630cc6a33e527b99be7347f3bd63510f Reviewed-by: Gunnar Sletta --- .../auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp index 6dbdc83b08..4722c6bd54 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp @@ -208,7 +208,9 @@ void QQmlProfilerClient::messageReceived(const QByteArray &message) switch (data.detailType) { case QQmlProfilerClient::AnimationFrame: { - stream >> data.framerate >> data.animationcount; + int threadId; + stream >> data.framerate >> data.animationcount >> threadId; + QVERIFY(threadId >= 0); QVERIFY(data.framerate != -1); QVERIFY(data.animationcount != -1); break; -- cgit v1.2.3