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

Conflicts:
	src/animation/doc/src/qt3danimation-module.qdoc
	src/render/backend/abstractrenderer_p.h
	src/render/backend/buffervisitor_p.h
	src/render/backend/renderer.cpp
	src/render/backend/renderer_p.h
	src/render/backend/triangleboundingvolume_p.h
	src/render/backend/trianglesextractor_p.h
	src/render/frontend/sphere_p.h
	src/render/jobs/calcboundingvolumejob.cpp
	src/render/jobs/job_common_p.h
	src/render/jobs/pickboundingvolumejob.cpp
	src/render/jobs/pickboundingvolumejob_p.h
	src/render/jobs/pickboundingvolumeutils.cpp
	src/render/jobs/renderviewjobutils_p.h
	tests/auto/render/boundingsphere/tst_boundingsphere.cpp
	tests/auto/render/commons/testrenderer.h
	tests/auto/render/raycasting/tst_raycasting.cpp
	tests/auto/render/render.pro
	tests/auto/render/renderer/tst_renderer.cpp

Change-Id: I76633bc5a5a065e5f9ea62cc16563377e5c693a3

1 files changed, 7 insertions, 4 deletions

diff --git a/src/render/jobs/frustumcullingjob_p.h b/src/render/jobs/frustumcullingjob_p.h
index 8b0bc7150..f81e4c5b9 100644
--- a/src/render/jobs/frustumcullingjob_p.h
+++ b/src/render/jobs/frustumcullingjob_p.h
@@ -41,7 +41,8 @@
 #define QT3DRENDER_RENDER_FRUSTUMCULLINGJOB_P_H
 
 #include <Qt3DCore/qaspectjob.h>
-#include <QMatrix4x4>
+#include <Qt3DCore/private/matrix4x4_p.h>
+#include <Qt3DRender/private/aligned_malloc_p.h>
 
 //
 //  W A R N I N G
@@ -69,11 +70,13 @@ class FrustumCullingJob : public Qt3DCore::QAspectJob
 public:
     FrustumCullingJob();
 
+    QT3D_ALIGNED_MALLOC_AND_FREE()
+
     inline void setRoot(Entity *root) Q_DECL_NOTHROW { m_root = root; }
     inline void setActive(bool active) Q_DECL_NOTHROW { m_active = active; }
     inline bool isActive() const Q_DECL_NOTHROW { return m_active; }
-    inline void setViewProjection(const QMatrix4x4 &viewProjection) Q_DECL_NOTHROW { m_viewProjection = viewProjection; }
-    inline QMatrix4x4 viewProjection() const Q_DECL_NOTHROW { return m_viewProjection; }
+    inline void setViewProjection(const Matrix4x4 &viewProjection) Q_DECL_NOTHROW { m_viewProjection = viewProjection; }
+    inline Matrix4x4 viewProjection() const Q_DECL_NOTHROW { return m_viewProjection; }
 
     QVector<Entity *> visibleEntities() const Q_DECL_NOTHROW { return m_visibleEntities; }
 
@@ -81,7 +84,7 @@ public:
 
 private:
     void cullScene(Entity *e, const Plane *planes);
-    QMatrix4x4 m_viewProjection;
+    Matrix4x4 m_viewProjection;
     Entity *m_root;
     QVector<Entity *> m_visibleEntities;
     bool m_active;