diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2022-05-17 18:53:08 +0300 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-05-17 16:10:08 +0000 |
| commit | 67599b96a54a6a9419d3fed7a9a51e1de44b35c9 (patch) | |
| tree | d1c39d62213f1b220f4b0bdfc1527904f97db4d7 | |
| parent | c08b0234f0e7df0e28de969dcd1c4494fe2de3b8 (diff) | |
Fix missing includes
These popped up on a developer build of the newest dev branch.
I don't know whether there's been header refactoring churn
or whether the devs and CI use pch, but I certainly couldn't
build without these fixes, on Linux with GCC 11.
Pick-to: 6.3 6.2
Change-Id: Ic3529a33f4bc5c339b22c523d0be811ffb977c06
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
| -rw-r--r-- | src/core/aspects/qabstractaspect_p.h | 1 | ||||
| -rw-r--r-- | src/plugins/geometryloaders/default/objgeometryloader.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/geometryloaders/gltf/gltfgeometryloader.h | 1 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/assimp/assimpimporter.h | 1 | ||||
| -rw-r--r-- | src/plugins/sceneparsers/gltfexport/gltfexporter.h | 1 | ||||
| -rw-r--r-- | src/render/backend/uniform_p.h | 1 | ||||
| -rw-r--r-- | tests/auto/core/nodes/tst_nodes.cpp | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h index f3878ed55..fea5dc311 100644 --- a/src/core/aspects/qabstractaspect_p.h +++ b/src/core/aspects/qabstractaspect_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtCore/QHash> #include <Qt3DCore/qabstractaspect.h> #include <Qt3DCore/private/qaspectjobproviderinterface_p.h> diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp index 14a2b588e..8515b2ffa 100644 --- a/src/plugins/geometryloaders/default/objgeometryloader.cpp +++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp @@ -39,6 +39,7 @@ #include "objgeometryloader.h" +#include <QtCore/QHash> #include <QtCore/QLoggingCategory> #include <QtCore/QRegularExpression> #include <QtCore/QIODevice> diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h index 36ac0f174..f3a0961ab 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.h +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtCore/QHash> #include <QtCore/QJsonDocument> #include <Qt3DRender/private/qgeometryloaderinterface_p.h> diff --git a/src/plugins/sceneparsers/assimp/assimpimporter.h b/src/plugins/sceneparsers/assimp/assimpimporter.h index c1c8537cc..0488ec652 100644 --- a/src/plugins/sceneparsers/assimp/assimpimporter.h +++ b/src/plugins/sceneparsers/assimp/assimpimporter.h @@ -58,6 +58,7 @@ #include <assimp/DefaultLogger.hpp> #include <QtCore/QDir> +#include <QtCore/QHash> #include <QtCore/QList> #include <QtCore/QLoggingCategory> diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.h b/src/plugins/sceneparsers/gltfexport/gltfexporter.h index 0d30a2064..254bc2e2a 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.h +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.h @@ -54,6 +54,7 @@ #include <QtCore/qjsondocument.h> #include <QtCore/qjsonobject.h> #include <QtCore/qhash.h> +#include <QtCore/qset.h> #include <QtGui/qvector3d.h> #include <Qt3DRender/qabstractlight.h> diff --git a/src/render/backend/uniform_p.h b/src/render/backend/uniform_p.h index 24bbcd76c..8dedf6d63 100644 --- a/src/render/backend/uniform_p.h +++ b/src/render/backend/uniform_p.h @@ -58,6 +58,7 @@ #include <Qt3DCore/private/vector4d_p.h> #include <Qt3DRender/private/qt3drender_global_p.h> #include <QMatrix4x4> +#include <QVarLengthArray> #include <QVector2D> #include <QVector3D> #include <QColor> diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp index 1edaf42ce..b5458e2e7 100644 --- a/tests/auto/core/nodes/tst_nodes.cpp +++ b/tests/auto/core/nodes/tst_nodes.cpp @@ -40,6 +40,7 @@ #include <Qt3DCore/private/qnode_p.h> #include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DCore/private/vector_helper_p.h> +#include <QSet> #include <QSignalSpy> #include <testarbiter.h> #include <vector> |