Merge branch '5.9' into dev

Conflicts:
	src/render/backend/renderer.cpp
	src/render/backend/renderview.cpp
	src/render/graphicshelpers/graphicscontext_p.h
	src/render/graphicshelpers/graphicshelperes2_p.h
	src/render/graphicshelpers/graphicshelpergl2_p.h
	src/render/graphicshelpers/graphicshelpergl3_2_p.h
	src/render/graphicshelpers/graphicshelpergl3_3_p.h
	src/render/graphicshelpers/graphicshelpergl4_p.h
	src/render/graphicshelpers/graphicshelperinterface_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	tests/auto/animation/clipanimator/tst_clipanimator.cpp
	tests/auto/auto.pro
	tests/manual/manual.pro

Also disabled the QQmlMetaType codepaths following commit
49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The
QQmlMetaType codepaths will be re-enabled once a qt5.git
integration has succeeded.

Change-Id: Ia654d75425e6d406c472d19864383612208cad2b

1 files changed, 7 insertions, 1 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 39631ef99..2d7ec9cb3 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,15 +1,21 @@
 TEMPLATE = subdirs
 
 SUBDIRS = \
+    coretest \
     core \
     cmake
 
 installed_cmake.depends = cmake
-QT_FOR_CONFIG += 3dcore
 
+QT_FOR_CONFIG += 3dcore
 qtConfig(qt3d-render): SUBDIRS += render
 qtConfig(qt3d-input): SUBDIRS += input
 qtConfig(qt3d-animation): SUBDIRS += animation
 qtConfig(qt3d-extras): SUBDIRS += extras
 qtConfig(qt3d-render):qtConfig(qt3d-input): SUBDIRS += quick3d
 
+for(subdir, SUBDIRS) {
+    !equals(subdir, coretest) {
+        $${subdir}.depends += coretest
+    }
+}