diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-01-24 13:24:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-15 22:37:38 +0100 |
| commit | 9424383e6d0ea1dd02dcf1070259e21550da692a (patch) | |
| tree | f7a9b1372a0a97f997d6a237e3a89e009b07b30e /src/quick/qtquick2.cpp | |
| parent | ab6b6b7c7ab544d347d59b7eefad403837d94012 (diff) | |
Move QtQuick profiling to own profiler adapter
The QtQuick parts of the QML profiler service thus become a proper
global profiler which can be independently enabled and disabled.
Change-Id: Ifad03801cab2be66a264fc46fdebdae582fcc99b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/quick/qtquick2.cpp')
| -rw-r--r-- | src/quick/qtquick2.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp index ee5034c108..9d2a0b0f75 100644 --- a/src/quick/qtquick2.cpp +++ b/src/quick/qtquick2.cpp @@ -49,6 +49,7 @@ #include <private/qqmldebugstatesdelegate_p.h> #include <private/qqmlbinding_p.h> #include <private/qqmlcontext_p.h> +#include <private/qquickprofiler_p.h> #include <private/qquickapplication_p.h> #include <QtQuick/private/qquickpropertychanges_p.h> #include <QtQuick/private/qquickstate_p.h> @@ -189,9 +190,10 @@ void QQmlQtQuick2Module::defineModule() QQuickValueTypes::registerValueTypes(); - if (QQmlEngineDebugService::isDebuggingEnabled()) { + if (QQmlDebugService::isDebuggingEnabled()) { QQmlEngineDebugService::instance()->setStatesDelegate( new QQmlQtQuick2DebugStatesDelegate); + QQuickProfiler::initialize(); } } |