aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-03-07 16:20:23 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-18 12:02:39 +0100
commit5977fbfd16f4d2d268dfecc48b1120a1f0dcf004 (patch)
treea7a744047668acfa5ba2e9d2ced8184d1ab85b3c /tests
parentb456fb1a11302557ac51ac47c635ba993d1653a3 (diff)
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 <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp4
1 files changed, 3 insertions, 1 deletions
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;