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.

Pick-to: 6.10 6.9 6.8 6.5
Change-Id: I417307626f61b47f694b18424f8c2941f7b8a31c
Reviewed-by: Volker Hilsheimer <[email protected]>

8 files changed, 16 insertions, 0 deletions

diff --git a/src/animation/backend/skeleton_p.h b/src/animation/backend/skeleton_p.h
index 65ac4e08e..61f9e84ed 100644
--- a/src/animation/backend/skeleton_p.h
+++ b/src/animation/backend/skeleton_p.h
@@ -16,8 +16,11 @@
 //
 
 #include <Qt3DAnimation/private/backendnode_p.h>
+
 #include <Qt3DCore/private/sqt_p.h>
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
diff --git a/src/animation/frontend/qkeyframeanimation_p.h b/src/animation/frontend/qkeyframeanimation_p.h
index b6e1b9556..991955320 100644
--- a/src/animation/frontend/qkeyframeanimation_p.h
+++ b/src/animation/frontend/qkeyframeanimation_p.h
@@ -19,6 +19,8 @@
 #include <Qt3DAnimation/qkeyframeanimation.h>
 #include <private/qabstractanimation_p.h>
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DAnimation {
diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.cpp b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
index 4d32d1cc7..e0df86713 100644
--- a/src/plugins/sceneparsers/assimp/assimpimporter.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpimporter.cpp
@@ -25,7 +25,9 @@
 #include <Qt3DAnimation/qkeyframeanimation.h>
 #include <Qt3DAnimation/qmorphinganimation.h>
 #include <QtCore/QFileInfo>
+
 #include <QtGui/QColor>
+#include <QtGui/qquaternion.h>
 
 #include <qmath.h>
 
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
index 3abc80409..074968dbf 100644
--- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp
@@ -10,6 +10,7 @@
 #include <QtCore/qjsonobject.h>
 #include <QtCore/qmath.h>
 
+#include <QtGui/qquaternion.h>
 #include <QtGui/qvector2d.h>
 
 #include <Qt3DCore/qentity.h>
diff --git a/src/plugins/sceneparsers/gltf/gltfio.cpp b/src/plugins/sceneparsers/gltf/gltfio.cpp
index 111a8f1f4..1c67a25d3 100644
--- a/src/plugins/sceneparsers/gltf/gltfio.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfio.cpp
@@ -34,6 +34,8 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
+
+#include <QtGui/qquaternion.h>
 #include <QtGui/QVector2D>
 
 #include "gltfio.h"
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index 175306169..96455bcb8 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -26,6 +26,8 @@
 
 #include <QtQml/qqml.h>
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 extern void qml_register_types_Qt3D_Core();
diff --git a/src/render/geometry/gltfskeletonloader.cpp b/src/render/geometry/gltfskeletonloader.cpp
index 9d46a3475..3c5ed6dfc 100644
--- a/src/render/geometry/gltfskeletonloader.cpp
+++ b/src/render/geometry/gltfskeletonloader.cpp
@@ -17,6 +17,8 @@
 #include <Qt3DCore/private/qmath3d_p.h>
 #include <Qt3DCore/private/qloadgltf_p.h>
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 using namespace Qt3DCore;
diff --git a/src/render/geometry/joint_p.h b/src/render/geometry/joint_p.h
index b5b368d43..515c1610d 100644
--- a/src/render/geometry/joint_p.h
+++ b/src/render/geometry/joint_p.h
@@ -19,6 +19,8 @@
 #include <Qt3DCore/private/sqt_p.h>
 #include <Qt3DRender/private/handle_types_p.h>
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {