Use DEFINE_BOOL_CONFIG_OPTION for QML_RENDER_TIMING
authorThomas McGuire <thomas.mcguire.qnx@kdab.com>
Fri, 7 Sep 2012 08:16:39 +0000 (10:16 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 10 Sep 2012 12:24:05 +0000 (14:24 +0200)
This makes it easier to grep for.

Change-Id: I7630e05c4afddb4ab3ce1a7691466d7307325988
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
src/quick/items/qquickthreadedwindowmanager.cpp

index 3bc7211..3d480ce 100644 (file)
@@ -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