diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-04-27 11:56:17 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2020-05-06 15:29:54 +0200 |
| commit | 764924da8ab3255c1b8d1ad5b39f85675f4b855e (patch) | |
| tree | c7b3e9d94318fd347ef2717feb5b539f5c18ff13 /src/render/frontend | |
| parent | 9838d91e2d433f13c57bdae48e31ba0b909988aa (diff) | |
Fix build for Qt6
- updated dependencies, excluding qtgamepad for now
- fixed issues with Q_PROPERTY not supporting forward declarations
- fixed for changes in QtQuick private API
- fixed for changes in QtOpenGLVersionFunctions API
- fixed for removal of QT_OPENGL_ES* macros
- fixed for changes in QtConcurrent API
- fixed RHI based build
Change-Id: I42ccd2f101b7f0a78e2860c6d551722bf6710a11
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/frontend')
| -rw-r--r-- | src/render/frontend/qcamera.h | 6 | ||||
| -rw-r--r-- | src/render/frontend/qlevelofdetail.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index b57f57957..82a1c04bd 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -41,6 +41,7 @@ #define QT3DRENDER_CAMERA_H #include <Qt3DCore/qentity.h> +#include <Qt3DCore/qtransform.h> #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qcameralens.h> #include <QtGui/QMatrix4x4> @@ -49,11 +50,6 @@ QT_BEGIN_NAMESPACE -namespace Qt3DCore { -class QEntity; -class QTransform; -} - namespace Qt3DRender { class QCameraPrivate; diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h index 1192ff1e8..f31c90db7 100644 --- a/src/render/frontend/qlevelofdetail.h +++ b/src/render/frontend/qlevelofdetail.h @@ -43,6 +43,7 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DRender/qt3drender_global.h> #include <Qt3DRender/qlevelofdetailboundingsphere.h> +#include <Qt3DRender/qcamera.h> #include <QtGui/QVector3D> @@ -50,7 +51,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { -class QCamera; class QLevelOfDetailPrivate; class Q_3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent |