diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2014-09-11 18:17:51 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2014-09-11 19:20:16 +0300 |
| commit | 255773dcba72817fea1295462337948ef91e996c (patch) | |
| tree | 11ca357cc821ca7d02b2057c04217932af591230 /src | |
| parent | 699dbb8914e718013d9ee0cbb39bdb4b6f833710 (diff) | |
Fix build error in latest qtdeclarative
Change-Id: Icd2dbadaa0302ceaf06daaeb26b10cb9403cc492
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/scenegraph/softwarecontext/renderloop.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.cpp b/src/plugins/scenegraph/softwarecontext/renderloop.cpp index 7dd20342bc..0129123a37 100644 --- a/src/plugins/scenegraph/softwarecontext/renderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/renderloop.cpp @@ -122,7 +122,7 @@ void RenderLoop::renderWindow(QQuickWindow *window) } QElapsedTimer renderTimer; qint64 renderTime = 0, syncTime = 0, polishTime = 0; - bool profileFrames = QSG_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::enabled; + bool profileFrames = QSG_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::featuresEnabled; if (profileFrames) renderTimer.start(); diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp index 6b8991552d..278c1a3db4 100644 --- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp @@ -454,7 +454,7 @@ void RenderThread::sync(bool inExpose) void RenderThread::syncAndRender() { - bool profileFrames = QSG_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::enabled; + bool profileFrames = QSG_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::featuresEnabled; if (profileFrames) { sinceLastTime = threadTimer.nsecsElapsed(); threadTimer.start(); @@ -985,7 +985,7 @@ void ThreadedRenderLoop::polishAndSync(Window *w, bool inExpose) qint64 polishTime = 0; qint64 waitTime = 0; qint64 syncTime = 0; - bool profileFrames = QSG_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::enabled; + bool profileFrames = QSG_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::featuresEnabled; if (profileFrames) timer.start(); |