From eeaba26596d447c531dfac9d6e6bf5cfe4537813 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 23 Jan 2014 17:18:05 +0100 Subject: Infrastructure for supporting multiple profilers in qqmlprofilerservice The concepts of "global" and "engine" profilers are introduced. Profilers can either be attached to specific QML engines and run in their threads or they can be unspecific global profilers running in arbitrary threads. Change-Id: I3862fc65c07ccb33a1ca08cd2425e4079d3ffc02 Reviewed-by: Kai Koehne --- .../debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'tests/auto/qml/debugger/qqmlprofilerservice') diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp index 14a6178b09..d05dfa8496 100644 --- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp +++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp @@ -100,6 +100,7 @@ public: Creating, Binding, //running a binding HandlingSignal, //running a signal handler + Javascript, MaximumRangeType }; @@ -214,9 +215,16 @@ void QQmlProfilerClient::messageReceived(const QByteArray &message) case QQmlProfilerClient::FramePaint: case QQmlProfilerClient::Mouse: case QQmlProfilerClient::Key: - case QQmlProfilerClient::StartTrace: + break; case QQmlProfilerClient::EndTrace: + case QQmlProfilerClient::StartTrace: { + int engineId = -1; + if (!stream.atEnd()) { + stream >> engineId; + QVERIFY(engineId >= 0); + } break; + } default: { QString failMsg = QString("Unknown event type:") + data.detailType; QFAIL(qPrintable(failMsg)); -- cgit v1.2.3