Include what you need: qquaternion.hHEADdev

qmatrix4x4.h will lose its qquaternion.h include, so include
qquaternion.h explicitly in all files that mention 'QQuaternion',
unless, for a foo.cpp, the own foo.h has already included it.

Picking all the way back, even though the include removal won't be
picked as far back, because it's the correct thing to do and cannot
fail.

Also remove the qquaternion.h include from qphysicscommands_p.h, which
doesn't need it, and replace it with qgenericmatrix.h for QMatrix3x3.

Appears to amend all the way back to the initial commit,
55c81ede6a45f1fd1f7c5ad299b230f5878b8d70.

Pick-to: 6.10 6.9 6.8 6.5
Change-Id: I551efcbc03a8f6b56e4a7f8531075c273d39b497
Reviewed-by: Jonas Karlsson <[email protected]>

7 files changed, 14 insertions, 1 deletions

diff --git a/src/quick3dphysics/physxnode/qphysxactorbody.cpp b/src/quick3dphysics/physxnode/qphysxactorbody.cpp
index afda5a6..bf787d1 100644
--- a/src/quick3dphysics/physxnode/qphysxactorbody.cpp
+++ b/src/quick3dphysics/physxnode/qphysxactorbody.cpp
@@ -16,6 +16,8 @@
 #include "qplaneshape_p.h"
 #include "qstaticphysxobjects_p.h"
 
+#include <QtGui/qquaternion.h>
+
 #define PHYSX_RELEASE(x)                                                                           \
     if (x != nullptr) {                                                                            \
         x->release();                                                                              \
diff --git a/src/quick3dphysics/physxnode/qphysxdynamicbody.cpp b/src/quick3dphysics/physxnode/qphysxdynamicbody.cpp
index fd7b996..ff7066c 100644
--- a/src/quick3dphysics/physxnode/qphysxdynamicbody.cpp
+++ b/src/quick3dphysics/physxnode/qphysxdynamicbody.cpp
@@ -11,6 +11,8 @@
 #include "qabstractphysicsbody_p.h"
 #include "qdynamicrigidbody_p.h"
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 static void processCommandQueue(QQueue<QPhysicsCommand *> &commandQueue,
diff --git a/src/quick3dphysics/qabstractphysicsnode.cpp b/src/quick3dphysics/qabstractphysicsnode.cpp
index b19b81c..3358cd3 100644
--- a/src/quick3dphysics/qabstractphysicsnode.cpp
+++ b/src/quick3dphysics/qabstractphysicsnode.cpp
@@ -6,6 +6,9 @@
 #include <foundation/PxTransform.h>
 
 #include "qphysicsworld_p.h"
+
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/quick3dphysics/qdynamicrigidbody_p.h b/src/quick3dphysics/qdynamicrigidbody_p.h
index 982e901..5c1108d 100644
--- a/src/quick3dphysics/qdynamicrigidbody_p.h
+++ b/src/quick3dphysics/qdynamicrigidbody_p.h
@@ -21,6 +21,8 @@
 #include <QtCore/QQueue>
 #include <QtQuick3DUtils/private/qssgutils_p.h>
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 class QPhysicsCommand;
diff --git a/src/quick3dphysics/qphysicscommands.cpp b/src/quick3dphysics/qphysicscommands.cpp
index 8dc54fc..ca0d3b5 100644
--- a/src/quick3dphysics/qphysicscommands.cpp
+++ b/src/quick3dphysics/qphysicscommands.cpp
@@ -7,6 +7,8 @@
 #include "qdynamicrigidbody_p.h"
 #include "PxPhysicsAPI.h"
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 static bool isKinematicBody(physx::PxRigidBody &body)
diff --git a/src/quick3dphysics/qphysicscommands_p.h b/src/quick3dphysics/qphysicscommands_p.h
index 95867c0..3e8b564 100644
--- a/src/quick3dphysics/qphysicscommands_p.h
+++ b/src/quick3dphysics/qphysicscommands_p.h
@@ -19,7 +19,7 @@
 
 #include <QtCore/QList>
 #include <QtGui/QVector3D>
-#include <QQuaternion>
+#include <QtGui/qgenericmatrix.h>
 
 namespace physx {
 class PxRigidBody;
diff --git a/src/quick3dphysics/qphysicsworld.cpp b/src/quick3dphysics/qphysicsworld.cpp
index 7ffaf94..ef445a5 100644
--- a/src/quick3dphysics/qphysicsworld.cpp
+++ b/src/quick3dphysics/qphysicsworld.cpp
@@ -28,6 +28,8 @@
 #include <QtQuick3D/private/qquick3dprincipledmaterial_p.h>
 #include <QtQuick3DUtils/private/qssgutils_p.h>
 
+#include <QtGui/qquaternion.h>
+
 #include <QtEnvironmentVariables>
 
 #define PHYSX_ENABLE_PVD 0