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, 2 insertions, 2 deletions

diff --git a/src/animation/backend/handler.cpp b/src/animation/backend/handler.cpp
index 8ced81cd1..ce7aa3c17 100644
--- a/src/animation/backend/handler.cpp
+++ b/src/animation/backend/handler.cpp
@@ -217,7 +217,7 @@ QVector<Qt3DCore::QAspectJobPtr> Handler::jobsToExecute(qint64 time)
         if (oldSize < newSize) {
             m_evaluateClipAnimatorJobs.resize(newSize);
             for (int i = oldSize; i < newSize; ++i) {
-                m_evaluateClipAnimatorJobs[i].reset(new EvaluateClipAnimatorJob());
+                m_evaluateClipAnimatorJobs[i] = QSharedPointer<EvaluateClipAnimatorJob>::create();
                 m_evaluateClipAnimatorJobs[i]->setHandler(this);
             }
         }
@@ -243,7 +243,7 @@ QVector<Qt3DCore::QAspectJobPtr> Handler::jobsToExecute(qint64 time)
         if (oldSize < newSize) {
             m_evaluateBlendClipAnimatorJobs.resize(newSize);
             for (int i = oldSize; i < newSize; ++i) {
-                m_evaluateBlendClipAnimatorJobs[i].reset(new EvaluateBlendClipAnimatorJob());
+                m_evaluateBlendClipAnimatorJobs[i] = QSharedPointer<EvaluateBlendClipAnimatorJob>::create();
                 m_evaluateBlendClipAnimatorJobs[i]->setHandler(this);
             }
         }