From 7ac98d7c92b69aa72069fdd8f6be3edbbd3324a2 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Fri, 7 Sep 2012 10:16:39 +0200 Subject: [PATCH] Use DEFINE_BOOL_CONFIG_OPTION for QML_RENDER_TIMING This makes it easier to grep for. Change-Id: I7630e05c4afddb4ab3ce1a7691466d7307325988 Reviewed-by: Gunnar Sletta Reviewed-by: Sean Harmer --- src/quick/items/qquickthreadedwindowmanager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/quick/items/qquickthreadedwindowmanager.cpp b/src/quick/items/qquickthreadedwindowmanager.cpp index 3bc7211..3d480ce 100644 --- a/src/quick/items/qquickthreadedwindowmanager.cpp +++ b/src/quick/items/qquickthreadedwindowmanager.cpp @@ -63,7 +63,7 @@ const QEvent::Type QEvent_DeferredUpdate = QEvent::Type(QEvent::User + 1); #define QQUICK_RENDER_TIMING #ifdef QQUICK_RENDER_TIMING -static bool qquick_render_timing = !qgetenv("QML_RENDER_TIMING").isEmpty(); +DEFINE_BOOL_CONFIG_OPTION(qquick_render_timing, QML_RENDER_TIMING) static QTime threadTimer; static int syncTime; static int renderTime; @@ -376,7 +376,7 @@ void QQuickRenderThreadSingleContextWindowManager::run() printf(" RenderThread: Doing locked sync\n"); #endif #ifdef QQUICK_RENDER_TIMING - if (qquick_render_timing) + if (qquick_render_timing()) threadTimer.start(); #endif inSync = true; @@ -418,7 +418,7 @@ void QQuickRenderThreadSingleContextWindowManager::run() printf(" RenderThread: sync done\n"); #endif #ifdef QQUICK_RENDER_TIMING - if (qquick_render_timing) + if (qquick_render_timing()) syncTime = threadTimer.elapsed(); #endif @@ -446,7 +446,7 @@ void QQuickRenderThreadSingleContextWindowManager::run() windowPrivate->renderSceneGraph(windowData->viewportSize); #ifdef QQUICK_RENDER_TIMING - if (qquick_render_timing) + if (qquick_render_timing()) renderTime = threadTimer.elapsed() - syncTime; #endif @@ -475,7 +475,7 @@ void QQuickRenderThreadSingleContextWindowManager::run() } #ifdef QQUICK_RENDER_TIMING - if (qquick_render_timing) { + if (qquick_render_timing()) { swapTime = threadTimer.elapsed() - renderTime; qDebug() << "- Breakdown of frame time; sync:" << syncTime << "ms render:" << renderTime << "ms swap:" << swapTime -- 2.7.4