diff options
| author | Marc Mutz <[email protected]> | 2025-07-04 10:00:18 +0200 |
|---|---|---|
| committer | Marc Mutz <[email protected]> | 2025-07-04 10:52:21 +0200 |
| commit | c172b40ac6b2424c7faced30c78241fe50d80f5b (patch) | |
| tree | 3ff0fcfd64efaef3d0917a8c047dcaa6dac676ef /src/plugins | |
| parent | 441b4bcec17385953d97459ece1b37ba3946af69 (diff) | |
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]>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/gltf/gltfimporter.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/gltf/gltfio.cpp | 2 |
3 files changed, 5 insertions, 0 deletions
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" |