Merge remote-tracking branch 'origin/5.10' into 5.11

Conflicts:
	src/animation/doc/src/qt3danimation-module.qdoc
	src/render/backend/abstractrenderer_p.h
	src/render/backend/buffervisitor_p.h
	src/render/backend/renderer.cpp
	src/render/backend/renderer_p.h
	src/render/backend/triangleboundingvolume_p.h
	src/render/backend/trianglesextractor_p.h
	src/render/frontend/sphere_p.h
	src/render/jobs/calcboundingvolumejob.cpp
	src/render/jobs/job_common_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	src/render/jobs/pickboundingvolumejob_p.h
	src/render/jobs/pickboundingvolumeutils.cpp
	src/render/jobs/renderviewjobutils_p.h
	tests/auto/render/boundingsphere/tst_boundingsphere.cpp
	tests/auto/render/commons/testrenderer.h
	tests/auto/render/raycasting/tst_raycasting.cpp
	tests/auto/render/render.pro
	tests/auto/render/renderer/tst_renderer.cpp

Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3

1 files changed, 1 insertions, 1 deletions

diff --git a/src/render/services/vsyncframeadvanceservice.cpp b/src/render/services/vsyncframeadvanceservice.cpp
index 8749a54ab..c8437e20d 100644
--- a/src/render/services/vsyncframeadvanceservice.cpp
+++ b/src/render/services/vsyncframeadvanceservice.cpp
@@ -89,7 +89,7 @@ qint64 VSyncFrameAdvanceService::waitForNextFrame()
     if (d->m_drivenByRenderThread)
         d->m_semaphore.acquire(1);
     else
-        d->m_semaphore.acquire(d->m_semaphore.available() + 1);
+        d->m_semaphore.acquire(d->m_semaphore.available());
 
     const quint64 currentTime = d->m_elapsed.nsecsElapsed();
     qCDebug(VSyncAdvanceService) << "Elapsed nsecs since last call " << currentTime - d->m_elapsedTimeSincePreviousFrame;