diff options
| author | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-01-07 14:51:05 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-01-08 12:42:57 +0200 |
| commit | 3195e2785cc5dff36dd03d2295d0daa35a6e5815 (patch) | |
| tree | dfc68e11a2dc15e3c6f78c30b7ead09d50d173ca | |
| parent | af30f6492bedb0d24a2d5b518e4e01f000852520 (diff) | |
Remove deprecated macro to enable build with Qt 5.5
Change-Id: Ia1a49a806dc2f822bee92787a45a49a4bc3c573f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| -rw-r--r-- | src/plugins/scenegraph/softwarecontext/renderloop.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp | 11 |
2 files changed, 0 insertions, 17 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.cpp b/src/plugins/scenegraph/softwarecontext/renderloop.cpp index 7a931101dc..f765e15d63 100644 --- a/src/plugins/scenegraph/softwarecontext/renderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/renderloop.cpp @@ -106,7 +106,6 @@ void RenderLoop::renderWindow(QQuickWindow *window) if (profileFrames) { polishTime = renderTimer.nsecsElapsed(); - Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphPolishFrame, (polishTime)); } emit window->afterAnimating(); @@ -148,11 +147,6 @@ void RenderLoop::renderWindow(QQuickWindow *window) lastFrameTime = QTime::currentTime(); } - Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphRenderLoopFrame, ( - syncTime - polishTime, - renderTime - syncTime, - swapTime - renderTime)); - // Might have been set during syncSceneGraph() if (data.updatePending) maybeUpdate(window); diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp index a2407a0671..23e36bf20d 100644 --- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp @@ -530,11 +530,6 @@ void RenderThread::syncAndRender() int((renderTime - syncTime) / 1000000), int(threadTimer.elapsed() - renderTime / 1000000)); - - Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphRenderLoopFrame, ( - syncTime, - renderTime - syncTime, - threadTimer.nsecsElapsed() - renderTime)); } @@ -1035,12 +1030,6 @@ void ThreadedRenderLoop::polishAndSync(Window *w, bool inExpose) << ", blockedForSync=" << (syncTime - waitTime) / 1000000 << ", animations=" << (timer.nsecsElapsed() - syncTime) / 1000000 << " - (on Gui thread) " << window; - - Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphPolishAndSync, ( - polishTime, - waitTime - polishTime, - syncTime - waitTime, - timer.nsecsElapsed() - syncTime)); } ThreadedRenderLoop::Window *ThreadedRenderLoop::windowForTimer(int timerId) const |