Make sure that profiling can only be started if debugging is enabled.
authorUlf Hermann <ulf.hermann@digia.com>
Wed, 15 Jan 2014 11:30:36 +0000 (12:30 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 15 Jan 2014 13:09:50 +0000 (14:09 +0100)
commit019598f57e892feacfb43b1095b3ccf5cec4d4ee
treed47d77404ddaae48aa59e03349191fee84facc19
parent662046fe17c76d4fe505f0a04a66aa3477c14b32
Make sure that profiling can only be started if debugging is enabled.

Enabling the profiler doesn't make much sense if there is no debug
service as the messages can't be sent anywhere then. Furthermore, the
profiler instance is only properly initialized if debugging is enabled
and thus enabling profiling without debugging being enabled can cause
problems.

Change-Id: I784a110126d45a9a2bc9d9e14d9a22e2980c3a42
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
src/qml/debugger/qqmlprofilerservice.cpp
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
tests/auto/qml/debugger/qqmlprofilerservice/data/controlFromJS.qml [new file with mode: 0644]
tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp