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

 Conflicts:
	src/render/backend/renderer_p.h
	src/render/geometry/geometryrenderer.cpp
	src/render/geometry/qmesh.cpp
	src/render/geometry/qmesh_p.h
	tests/auto/render/commons/testrenderer.h
	tests/auto/render/meshfunctors/tst_meshfunctors.cpp
	tests/auto/render/qmesh/tst_qmesh.cpp

Change-Id: Ia078029e2faf23fe253c5ce385e393c094266e3b

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/auto/render/commons/testrenderer.h b/tests/auto/render/commons/testrenderer.h
index b26a3ffad..327e08d78 100644
--- a/tests/auto/render/commons/testrenderer.h
+++ b/tests/auto/render/commons/testrenderer.h
@@ -52,7 +52,7 @@ public:
     void shutdown() override {}
     void releaseGraphicsResources() override {}
     void render() override {}
-    void doRender() override {}
+    void doRender(bool scene3dBlocking = false) override { Q_UNUSED(scene3dBlocking); }
     void cleanGraphicsResources() override {}
     bool isRunning() const override { return true; }
     bool shouldRender() override { return true; }