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/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h | |
| 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/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h')
| -rw-r--r-- | src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h index 1fa390806..8d3e8f957 100644 --- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h +++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelpergl4_p.h @@ -54,7 +54,7 @@ #include <graphicshelperinterface_p.h> #include <QtCore/qscopedpointer.h> -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) QT_BEGIN_NAMESPACE |