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/scenegraph/util/qsgatlastexture.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/scenegraph/util/qsgatlastexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index e39949253f..fe659c9add 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -52,7 +52,7 @@ #include <private/qsgtexture_p.h> -#include <private/qqmlprofilerservice_p.h> +#include <private/qquickprofiler_p.h> QT_BEGIN_NAMESPACE @@ -374,7 +374,7 @@ bool Atlas::bind(QSGTexture::Filtering filtering) for (int i=0; i<m_pending_uploads.size(); ++i) { #ifndef QSG_NO_RENDER_TIMING - bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled; + bool profileFrames = qsg_render_timing || QQuickProfiler::enabled; if (profileFrames) qsg_renderer_timer.start(); #endif @@ -394,7 +394,7 @@ bool Atlas::bind(QSGTexture::Filtering filtering) (int) (qsg_renderer_timer.elapsed())); } - Q_QML_SG_PROFILE1(QQmlProfilerService::SceneGraphTexturePrepare, ( + Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTexturePrepare, ( 0, // bind (not relevant) 0, // convert (not relevant) 0, // swizzle (not relevant) |