Include what you need: qquaternion.h

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 <volker.hilsheimer@qt.io>

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)

examples/qt3d/simple-cpp/main.cpp

@@ -18,6 +18,8 @@
 #include <Qt3DExtras/QSphereMesh>
 #include <Qt3DExtras/QTorusMesh>
 
+#include <QtGui/QQuaternion>
+
 #include <QPropertyAnimation>
 
 #include "qt3dwindow.h"

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 {

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 {

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>
 

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>

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"

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();

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;

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 {

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

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;

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

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;

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>
 

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

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);

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)

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);

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>

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)

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);

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);

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

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:

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>