diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-01-23 17:18:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-13 08:18:42 +0100 |
| commit | eeaba26596d447c531dfac9d6e6bf5cfe4537813 (patch) | |
| tree | 90cb8aa8a60c26ff7bf6ad85242069185453931e /tests/auto/qml/qqmlconsole | |
| parent | 68dabbf62b867e092a2860e5cde1813768176a3e (diff) | |
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 <kai.koehne@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlconsole')
| -rw-r--r-- | tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp index a37d705284..43aa82e1e4 100644 --- a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp +++ b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp @@ -116,7 +116,7 @@ void tst_qqmlconsole::profiling() // profiling() QTest::ignoreMessage(QtWarningMsg, "Cannot start profiling because debug service is disabled. Start with -qmljsdebugger=port:XXXXX."); - QTest::ignoreMessage(QtWarningMsg, "Profiling was not started."); + QTest::ignoreMessage(QtWarningMsg, "Ignoring console.profileEnd(): the debug service is disabled."); QQmlComponent component(&engine, testUrl); QObject *object = component.create(); |