summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@digia.com>2014-01-02 15:55:41 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-17 10:39:25 +0100
commit717ae864d258568e3dc94cd2d43b7b9d6375a222 (patch)
tree5512e76c2e84b37553d452af279cc0ccc7d11f70 /src
parent814504306df0b76da1654a74524bdc353527d06f (diff)
Switch QML profiler off when deleting QQmlProfilerService
Like this we don't have to check for QQmlProfilerService::instance anymore in order to find out if we can use the profiler service. If instance == 0 then enabled == false. Furthermore if it was thread safe before it must still be thread safe like this. Task-number: QTBUG-35315 Change-Id: Ie5737e3586f2431afbf11423ba53fd13dd371feb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/debugger/qqmlprofilerservice.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qml/debugger/qqmlprofilerservice.cpp b/src/qml/debugger/qqmlprofilerservice.cpp
index af2aea21ae..8e169b1493 100644
--- a/src/qml/debugger/qqmlprofilerservice.cpp
+++ b/src/qml/debugger/qqmlprofilerservice.cpp
@@ -131,6 +131,7 @@ QQmlProfilerService::QQmlProfilerService()
QQmlProfilerService::~QQmlProfilerService()
{
+ enabled = false;
instance = 0;
}