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/extras/defaults | |
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/extras/defaults')
-rw-r--r-- | src/extras/defaults/qabstractspritesheet.h | 7 | ||||
-rw-r--r-- | src/extras/defaults/qforwardrenderer.h | 1 | ||||
-rw-r--r-- | src/extras/defaults/qspritesheet.h | 2 | ||||
-rw-r--r-- | src/extras/defaults/qt3dwindow.cpp | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/src/extras/defaults/qabstractspritesheet.h b/src/extras/defaults/qabstractspritesheet.h index ec72473f9..d52d801fd 100644 --- a/src/extras/defaults/qabstractspritesheet.h +++ b/src/extras/defaults/qabstractspritesheet.h @@ -42,17 +42,12 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DCore/QNode> +#include <Qt3DRender/qabstracttexture.h> #include <QtGui/QVector2D> #include <QtGui/QMatrix3x3> QT_BEGIN_NAMESPACE -namespace Qt3DRender { - -class QAbstractTexture; - -} // namespace Qt3DRender - namespace Qt3DExtras { class QAbstractSpriteSheetPrivate; diff --git a/src/extras/defaults/qforwardrenderer.h b/src/extras/defaults/qforwardrenderer.h index 22334373c..165b17a41 100644 --- a/src/extras/defaults/qforwardrenderer.h +++ b/src/extras/defaults/qforwardrenderer.h @@ -42,6 +42,7 @@ #include <Qt3DExtras/qt3dextras_global.h> #include <Qt3DRender/qtechniquefilter.h> +#include <Qt3DCore/qentity.h> #include <QtCore/QRectF> #include <QtGui/QColor> #include <Qt3DRender/QClearBuffers> diff --git a/src/extras/defaults/qspritesheet.h b/src/extras/defaults/qspritesheet.h index d1faeb825..93c4262b0 100644 --- a/src/extras/defaults/qspritesheet.h +++ b/src/extras/defaults/qspritesheet.h @@ -41,6 +41,7 @@ #define QT3DEXTRAS_QSPRITESHEET_H #include <Qt3DExtras/qabstractspritesheet.h> +#include <Qt3DExtras/qspritesheetitem.h> #include <QtCore/QRect> #include <QtCore/QVector> @@ -48,7 +49,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DExtras { -class QSpriteSheetItem; class QSpriteSheetPrivate; class Q_3DEXTRASSHARED_EXPORT QSpriteSheet : public QAbstractSpriteSheet diff --git a/src/extras/defaults/qt3dwindow.cpp b/src/extras/defaults/qt3dwindow.cpp index 8fcc77a29..34264a89f 100644 --- a/src/extras/defaults/qt3dwindow.cpp +++ b/src/extras/defaults/qt3dwindow.cpp @@ -298,7 +298,7 @@ void setupWindowSurface(QWindow *window, Qt3DRender::API api) noexcept break; } QSurfaceFormat format = QSurfaceFormat::defaultFormat(); -#ifdef QT_OPENGL_ES_2 +#if QT_CONFIG(opengles2) format.setRenderableType(QSurfaceFormat::OpenGLES); #else if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL) { |