diff options
author | Ulf Hermann <ulf.hermann@digia.com> | 2014-01-23 10:39:51 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-29 18:30:34 +0100 |
commit | 1bea30278d8e1355457af582969fc3ff9b2ed298 (patch) | |
tree | aff872897a4be5027891b4f6ae4cf9af06395c38 /src/qml/debugger/qqmlprofilerservice.cpp | |
parent | 13683d4ebc16f9cf22c0c2c67ee2f0acfc8c8fbc (diff) |
Change QQmlProfilerService::instance to be a getter
Change-Id: Id2eb973443cc73aac3a06f94c98b52334d9766a3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/debugger/qqmlprofilerservice.cpp')
-rw-r--r-- | src/qml/debugger/qqmlprofilerservice.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qml/debugger/qqmlprofilerservice.cpp b/src/qml/debugger/qqmlprofilerservice.cpp index 91d27f9b11..5d4574231e 100644 --- a/src/qml/debugger/qqmlprofilerservice.cpp +++ b/src/qml/debugger/qqmlprofilerservice.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE // instance will be set, unset in constructor. Allows static methods to be inlined. -QQmlProfilerService *QQmlProfilerService::instance = 0; +QQmlProfilerService *QQmlProfilerService::m_instance = 0; Q_GLOBAL_STATIC(QQmlProfilerService, profilerInstance) bool QQmlProfilerService::enabled = false; @@ -154,13 +154,14 @@ QQmlProfilerService::QQmlProfilerService() QQmlProfilerService::~QQmlProfilerService() { enabled = false; - instance = 0; + m_instance = 0; } -void QQmlProfilerService::initialize() +QQmlProfilerService *QQmlProfilerService::instance() { // just make sure that the service is properly registered - instance = profilerInstance(); + m_instance = profilerInstance(); + return m_instance; } bool QQmlProfilerService::startProfiling() |