diff options
author | Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com> | 2014-11-17 12:25:41 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@digia.com> | 2014-11-18 12:41:48 +0200 |
commit | 9dcb3e901a179f9211e5431ec966fb0b7de01429 (patch) | |
tree | 7bee4d1044e52f8a4b103f545d8dc42815a36ed9 /src/plugins/scenegraph/softwarecontext/renderloop.cpp | |
parent | 139ace5b57b82396dc37a6781bfae4a251172764 (diff) |
Logging: use category names different from those in declarative
Otherwise we end up with duplicated symbols when linking
statically.
This partly reverts commit 139ace5b57b82396dc37a6781bfae4a251172764.
Change-Id: I0b33cc00d19e7c541b33a72a7d27e1c0a895d988
Task-number: QTBUG-42679
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/plugins/scenegraph/softwarecontext/renderloop.cpp')
-rw-r--r-- | src/plugins/scenegraph/softwarecontext/renderloop.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.cpp b/src/plugins/scenegraph/softwarecontext/renderloop.cpp index fc7e92c6b8..7a931101dc 100644 --- a/src/plugins/scenegraph/softwarecontext/renderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/renderloop.cpp @@ -23,7 +23,6 @@ #include <private/qquickwindow_p.h> #include <QElapsedTimer> #include <private/qquickprofiler_p.h> -#include <private/qsgcontext_p.h> RenderLoop::RenderLoop() : eventPending(false) @@ -99,7 +98,7 @@ void RenderLoop::renderWindow(QQuickWindow *window) } QElapsedTimer renderTimer; qint64 renderTime = 0, syncTime = 0, polishTime = 0; - bool profileFrames = QSG_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::featuresEnabled; + bool profileFrames = QSG_RASTER_LOG_TIME_RENDERLOOP().isDebugEnabled() || QQuickProfiler::featuresEnabled; if (profileFrames) renderTimer.start(); @@ -136,9 +135,9 @@ void RenderLoop::renderWindow(QQuickWindow *window) if (profileFrames) swapTime = renderTimer.nsecsElapsed(); - if (QSG_LOG_TIME_RENDERLOOP().isDebugEnabled()) { + if (QSG_RASTER_LOG_TIME_RENDERLOOP().isDebugEnabled()) { static QTime lastFrameTime = QTime::currentTime(); - qCDebug(QSG_LOG_TIME_RENDERLOOP, + qCDebug(QSG_RASTER_LOG_TIME_RENDERLOOP, "Frame rendered with 'basic' renderloop in %dms, polish=%d, sync=%d, render=%d, swap=%d, frameDelta=%d", int(swapTime / 1000000), int(polishTime / 1000000), |