diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-24 17:47:44 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-25 09:29:41 +0200 |
| commit | b693a04343c70c7e3390abca8781e73925d31e69 (patch) | |
| tree | 349c619fdc7b62b30c929398281f8ce978543bc4 | |
| parent | c2630bd66cdec12721375236f1f2d7c4dd9ccad4 (diff) | |
Fix compilation with newer qtbase
Change-Id: Iaba2780c2ac28181cce15ae350fadd755a51999f
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
| -rw-r--r-- | src/animation/backend/animationutils_p.h | 1 | ||||
| -rw-r--r-- | src/input/frontend/qgenericinputdevice_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/geometryloaders/default/objgeometryloader.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/geometryloaders/default/plygeometryloader.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/geometryloaders/default/stlgeometryloader.cpp | 1 | ||||
| -rw-r--r-- | src/render/backend/uniform.cpp | 1 | ||||
| -rw-r--r-- | src/render/framegraph/qsetfence.h | 1 | ||||
| -rw-r--r-- | src/render/framegraph/qwaitfence.h | 1 | ||||
| -rw-r--r-- | src/render/texture/qabstracttexture.h | 1 |
9 files changed, 10 insertions, 0 deletions
diff --git a/src/animation/backend/animationutils_p.h b/src/animation/backend/animationutils_p.h index 5f7bdf6be..63aaa1a37 100644 --- a/src/animation/backend/animationutils_p.h +++ b/src/animation/backend/animationutils_p.h @@ -56,6 +56,7 @@ #include <QtCore/qbitarray.h> #include <QtCore/qdebug.h> +#include <QtCore/QVariant> #include <qmath.h> QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qgenericinputdevice_p.h b/src/input/frontend/qgenericinputdevice_p.h index ea04e7290..c72b0be81 100644 --- a/src/input/frontend/qgenericinputdevice_p.h +++ b/src/input/frontend/qgenericinputdevice_p.h @@ -55,6 +55,8 @@ #include <Qt3DInput/private/qt3dinput_global_p.h> +#include <QtCore/QVariant> + QT_BEGIN_NAMESPACE namespace Qt3DInput { diff --git a/src/plugins/geometryloaders/default/objgeometryloader.cpp b/src/plugins/geometryloaders/default/objgeometryloader.cpp index 484153216..0d4c22ec3 100644 --- a/src/plugins/geometryloaders/default/objgeometryloader.cpp +++ b/src/plugins/geometryloaders/default/objgeometryloader.cpp @@ -41,6 +41,7 @@ #include <QtCore/QLoggingCategory> #include <QtCore/QRegularExpression> +#include <QtCore/QIODevice> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geometryloaders/default/plygeometryloader.cpp b/src/plugins/geometryloaders/default/plygeometryloader.cpp index 2c9223c66..95ad183fd 100644 --- a/src/plugins/geometryloaders/default/plygeometryloader.cpp +++ b/src/plugins/geometryloaders/default/plygeometryloader.cpp @@ -41,6 +41,7 @@ #include <QtCore/QDataStream> #include <QtCore/QLoggingCategory> +#include <QtCore/QIODevice> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geometryloaders/default/stlgeometryloader.cpp b/src/plugins/geometryloaders/default/stlgeometryloader.cpp index a40cbb8a3..0f973a7e3 100644 --- a/src/plugins/geometryloaders/default/stlgeometryloader.cpp +++ b/src/plugins/geometryloaders/default/stlgeometryloader.cpp @@ -41,6 +41,7 @@ #include <QtCore/QDataStream> #include <QtCore/QLoggingCategory> +#include <QtCore/QIODevice> QT_BEGIN_NAMESPACE diff --git a/src/render/backend/uniform.cpp b/src/render/backend/uniform.cpp index 75178ede6..12b496161 100644 --- a/src/render/backend/uniform.cpp +++ b/src/render/backend/uniform.cpp @@ -39,6 +39,7 @@ #include "uniform_p.h" #include "qabstracttexture.h" +#include <QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qsetfence.h b/src/render/framegraph/qsetfence.h index 8747a0e02..7208710fc 100644 --- a/src/render/framegraph/qsetfence.h +++ b/src/render/framegraph/qsetfence.h @@ -38,6 +38,7 @@ ****************************************************************************/ #include <Qt3DRender/QFrameGraphNode> +#include <QtCore/QVariant> #ifndef QT3DRENDER_QSETFENCE_H #define QT3DRENDER_QSETFENCE_H diff --git a/src/render/framegraph/qwaitfence.h b/src/render/framegraph/qwaitfence.h index bae5981db..ffe1d6d75 100644 --- a/src/render/framegraph/qwaitfence.h +++ b/src/render/framegraph/qwaitfence.h @@ -41,6 +41,7 @@ #define QT3DRENDER_QWAITFENCE_H #include <Qt3DRender/QFrameGraphNode> +#include <QtCore/QVariant> QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h index d9a3ca5bb..47fc2a81d 100644 --- a/src/render/texture/qabstracttexture.h +++ b/src/render/texture/qabstracttexture.h @@ -44,6 +44,7 @@ #include <Qt3DRender/qtexturewrapmode.h> #include <Qt3DRender/qt3drender_global.h> #include <Qt3DCore/qnode.h> +#include <QtCore/QVariant> QT_BEGIN_NAMESPACE |