Merge remote-tracking branch 'origin/5.7' into 5.8

Conflicts:
	src/render/framegraph/qrendersurfaceselector.cpp
	src/render/frontend/qrendersettings.cpp
	src/render/jobs/renderviewjobutils_p.h
	tests/auto/render/render.pro

Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f

1 files changed, 1 insertions, 0 deletions

diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 34b282610..69080ea47 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -58,6 +58,7 @@ qtConfig(private_tests) {
         qrendertargetoutput \
         qcameralens \
         qcomputecommand \
+        loadscenejob \
         qrendercapture \
         uniform
 }