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

 Conflicts:
	src/render/backend/abstractrenderer_p.h
	src/render/backend/layer.cpp
	src/render/backend/layer_p.h
	src/render/backend/render-backend.pri
	src/render/backend/renderer_p.h
	src/render/backend/renderviewbuilder.cpp
	tests/auto/render/renderer/tst_renderer.cpp
	tests/auto/render/renderviewbuilder/tst_renderviewbuilder.cpp

Change-Id: I5c1b649052992e1b3483d549ddc188c8450e927f

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
index 6ddb058a1..51eb2d6fc 100644
--- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
+++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp
@@ -159,9 +159,14 @@ void benchmarkReleaseResources()
     QVector<Qt3DCore::QHandle<Resource> > handles(max);
     for (int i = 0; i < max; i++)
         handles[i] = manager.acquire();
+    for (int i = 0; i < max; i++)
+        manager.release(handles.at(i));
+    handles.clear();
 
     QBENCHMARK_ONCE {
-        /*manager.reset()*/;
+        // the release/clear should have left many unused handled in the resourcemanager,
+        // so the next acquire will trigger a collection of all freed resources
+        manager.acquire();
     }
 }