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]>

26 files changed, 57 insertions, 0 deletions

diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
index 6fa321659..61c064b6f 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.cpp
@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
 
 #include "scenemodifier.h"
+
 #include <Qt3DRender/QGeometryRenderer>
+
+#include <QtGui/QQuaternion>
+
 #include <QtCore/QDebug>
 
 SceneModifier::SceneModifier(Qt3DCore::QEntity *rootEntity)
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 756e47084..9cbe19b72 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -18,6 +18,8 @@
 #include <Qt3DExtras/QSphereMesh>
 #include <Qt3DExtras/QTorusMesh>
 
+#include <QtGui/QQuaternion>
+
 #include <QPropertyAnimation>
 
 #include "qt3dwindow.h"
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 {
diff --git a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
index 2623e1929..057b2300c 100644
--- a/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
+++ b/tests/auto/animation/qkeyframeanimation/tst_qkeyframeanimation.cpp
@@ -6,6 +6,8 @@
 #include <qobject.h>
 #include <qsignalspy.h>
 
+#include <QtGui/qquaternion.h>
+
 class tst_QKeyframeAnimation : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/animation/skeleton/tst_skeleton.cpp b/tests/auto/animation/skeleton/tst_skeleton.cpp
index 7bf227e34..0904f9c7b 100644
--- a/tests/auto/animation/skeleton/tst_skeleton.cpp
+++ b/tests/auto/animation/skeleton/tst_skeleton.cpp
@@ -11,6 +11,8 @@
 #include <qbackendnodetester.h>
 #include <testarbiter.h>
 
+#include <QtGui/qquaternion.h>
+
 using namespace Qt3DCore;
 using namespace Qt3DAnimation;
 using namespace Qt3DAnimation::Animation;
diff --git a/tests/auto/core/qjoint/tst_qjoint.cpp b/tests/auto/core/qjoint/tst_qjoint.cpp
index 8444b1511..824418054 100644
--- a/tests/auto/core/qjoint/tst_qjoint.cpp
+++ b/tests/auto/core/qjoint/tst_qjoint.cpp
@@ -8,6 +8,8 @@
 #include <QSignalSpy>
 #include <testarbiter.h>
 
+#include <QtGui/qquaternion.h>
+
 using namespace Qt3DCore;
 
 class tst_QJoint : public QObject
diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp
index 3b6fe93e0..c527962e3 100644
--- a/tests/auto/core/qtransform/tst_qtransform.cpp
+++ b/tests/auto/core/qtransform/tst_qtransform.cpp
@@ -7,7 +7,11 @@
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qcomponent.h>
 #include <Qt3DCore/private/qtransform_p.h>
+
+#include <QtGui/qquaternion.h>
+
 #include <QtCore/qscopedpointer.h>
+
 #include "testarbiter.h"
 
 using namespace Qt3DCore;
diff --git a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
index b10e11699..7bea75053 100644
--- a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
+++ b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp
@@ -24,6 +24,8 @@
 #include <Qt3DExtras/QSphereMesh>
 #include <Qt3DExtras/QTorusMesh>
 
+#include <QtGui/qquaternion.h>
+
 #include <QPropertyAnimation>
 #include <QThread>
 
diff --git a/tests/manual/component-changes/main.cpp b/tests/manual/component-changes/main.cpp
index d8672f50f..127844c38 100644
--- a/tests/manual/component-changes/main.cpp
+++ b/tests/manual/component-changes/main.cpp
@@ -15,6 +15,8 @@
 #include <Qt3DExtras/qt3dwindow.h>
 #include <Qt3DExtras/qorbitcameracontroller.h>
 
+#include <QtGui/qquaternion.h>
+
 #include <QTimer>
 
 class ComponentSwapper : public QObject
diff --git a/tests/manual/cylinder-cpp/main.cpp b/tests/manual/cylinder-cpp/main.cpp
index bb84caf96..7625d72fb 100644
--- a/tests/manual/cylinder-cpp/main.cpp
+++ b/tests/manual/cylinder-cpp/main.cpp
@@ -24,6 +24,8 @@
 #include <Qt3DExtras/qt3dwindow.h>
 #include <Qt3DExtras/qorbitcameracontroller.h>
 
+#include <QtGui/qquaternion.h>
+
 int main(int argc, char **argv)
 {
     QGuiApplication app(argc, argv);
diff --git a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp
index 42aa9855e..624f1276b 100644
--- a/tests/manual/deferred-renderer-cpp/screenquadentity.cpp
+++ b/tests/manual/deferred-renderer-cpp/screenquadentity.cpp
@@ -10,6 +10,8 @@
 #include <Qt3DCore/QTransform>
 #include <Qt3DExtras/QPlaneMesh>
 
+#include <QtGui/qquaternion.h>
+
 QT_BEGIN_NAMESPACE
 
 ScreenQuadEntity::ScreenQuadEntity(Qt3DCore::QNode *parent)
diff --git a/tests/manual/mesh-morphing/main.cpp b/tests/manual/mesh-morphing/main.cpp
index b00f2ca5d..66f04b809 100644
--- a/tests/manual/mesh-morphing/main.cpp
+++ b/tests/manual/mesh-morphing/main.cpp
@@ -22,6 +22,8 @@
 #include <Qt3DExtras/QForwardRenderer>
 #include <Qt3DExtras/qfirstpersoncameracontroller.h>
 
+#include <QtGui/qquaternion.h>
+
 int main(int argc, char **argv)
 {
     QGuiApplication app(argc, argv);
diff --git a/tests/manual/paintedtexture-cpp/scene.cpp b/tests/manual/paintedtexture-cpp/scene.cpp
index 1ed38a6f3..ac547f2c3 100644
--- a/tests/manual/paintedtexture-cpp/scene.cpp
+++ b/tests/manual/paintedtexture-cpp/scene.cpp
@@ -8,6 +8,8 @@
 #include <QtCore/QDateTime>
 
 #include <QtGui/QPainter>
+#include <QtGui/qquaternion.h>
+
 #include <Qt3DRender/QPaintedTextureImage>
 #include <Qt3DRender/QTexture>
 #include <Qt3DRender/QGeometryRenderer>
diff --git a/tests/manual/qtbug-72236/main.cpp b/tests/manual/qtbug-72236/main.cpp
index b859809f8..926b01bc8 100644
--- a/tests/manual/qtbug-72236/main.cpp
+++ b/tests/manual/qtbug-72236/main.cpp
@@ -30,6 +30,8 @@
 #include <Qt3DRender/QLayer>
 #include <Qt3DRender/QLayerFilter>
 
+#include <QtGui/qquaternion.h>
+
 using namespace Qt3DRender;
 
 int main(int argc, char **argv)
diff --git a/tests/manual/raster-cpp/main.cpp b/tests/manual/raster-cpp/main.cpp
index e4788c0ca..c038c171e 100644
--- a/tests/manual/raster-cpp/main.cpp
+++ b/tests/manual/raster-cpp/main.cpp
@@ -27,6 +27,8 @@
 #include <Qt3DExtras/qt3dwindow.h>
 #include <Qt3DExtras/qorbitcameracontroller.h>
 
+#include <QtGui/qquaternion.h>
+
 int main(int argc, char **argv)
 {
     QGuiApplication app(argc, argv);
diff --git a/tests/manual/render-qml-to-texture/main.cpp b/tests/manual/render-qml-to-texture/main.cpp
index dedd6fa32..5eb83616d 100644
--- a/tests/manual/render-qml-to-texture/main.cpp
+++ b/tests/manual/render-qml-to-texture/main.cpp
@@ -29,6 +29,8 @@
 #include "qfirstpersoncameracontroller.h"
 #include "planematerial.h"
 
+#include <QtGui/qquaternion.h>
+
 int main(int argc, char *argv[])
 {
     QGuiApplication app(argc, argv);
diff --git a/tests/manual/rendercapture-cpp/main.cpp b/tests/manual/rendercapture-cpp/main.cpp
index 5a9ef5c6b..8af3587f3 100644
--- a/tests/manual/rendercapture-cpp/main.cpp
+++ b/tests/manual/rendercapture-cpp/main.cpp
@@ -28,6 +28,8 @@
 #include "qorbitcameracontroller.h"
 #include "mycapture.h"
 
+#include <QtGui/qquaternion.h>
+
 Qt3DCore::QEntity *createScene()
 {
     // Root entity
diff --git a/tests/manual/rendertarget-cpp/main.cpp b/tests/manual/rendertarget-cpp/main.cpp
index 6e83ab5ad..3f3786fe2 100644
--- a/tests/manual/rendertarget-cpp/main.cpp
+++ b/tests/manual/rendertarget-cpp/main.cpp
@@ -42,6 +42,8 @@
 #include "orbittransformcontroller.h"
 #include "qorbitcameracontroller.h"
 
+#include <QtGui/qquaternion.h>
+
 class Renderer : public Qt3DRender::QRenderSurfaceSelector
 {
 public:
diff --git a/tests/manual/texture-updates-cpp/scene.cpp b/tests/manual/texture-updates-cpp/scene.cpp
index 9fbe25ac6..0ac3a6d1b 100644
--- a/tests/manual/texture-updates-cpp/scene.cpp
+++ b/tests/manual/texture-updates-cpp/scene.cpp
@@ -11,6 +11,9 @@
 #include <Qt3DExtras/QDiffuseMapMaterial>
 #include <Qt3DRender/QGeometryRenderer>
 #include <Qt3DRender/QTextureDataUpdate>
+
+#include <QtGui/qquaternion.h>
+
 #include <cstring>