diff options
| author | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-18 19:03:07 +0200 |
|---|---|---|
| committer | Tuomo Pelkonen <tuomo.pelkonen@gmail.com> | 2021-01-27 10:12:02 +0200 |
| commit | ff193e33d80a08ca0c21fdbccc2d63e6b7400d88 (patch) | |
| tree | b47fd1b52d76356c9e0359b347cdb96edb7795d4 /src/datavisualizationqml2 | |
| parent | 18a562554e9050f0d8b4896237dc0fb306f6a704 (diff) | |
Fix compilation issues for macOS and Android on Qt 6.0
Task-number: QTBUG-89297
Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualizationqml2')
| -rw-r--r-- | src/datavisualizationqml2/enumtostringmap.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualizationqml2/glstatestore.cpp | 12 | ||||
| -rw-r--r-- | src/datavisualizationqml2/glstatestore_p.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/datavisualizationqml2/enumtostringmap.cpp b/src/datavisualizationqml2/enumtostringmap.cpp index d683c0a1..e10e8bc0 100644 --- a/src/datavisualizationqml2/enumtostringmap.cpp +++ b/src/datavisualizationqml2/enumtostringmap.cpp @@ -393,7 +393,7 @@ EnumToStringMap::EnumToStringMap() : m_map[GL_FRAMEBUFFER_UNSUPPORTED] = "FRAMEBUFFER_UNSUPPORTED"; m_map[GL_FRAMEBUFFER_BINDING] = "FRAMEBUFFER_BINDING"; -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) m_map[GL_RENDERBUFFER_BINDING] = "RENDERBUFFER_BINDING"; #else m_map[GL_RENDERBUFFER] = "RENDERBUFFER_BINDING"; diff --git a/src/datavisualizationqml2/glstatestore.cpp b/src/datavisualizationqml2/glstatestore.cpp index 0d24f3f9..dfb4266f 100644 --- a/src/datavisualizationqml2/glstatestore.cpp +++ b/src/datavisualizationqml2/glstatestore.cpp @@ -87,7 +87,7 @@ void GLStateStore::storeGLState() printCurrentState(true); #endif -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &m_drawFramebuffer); glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &m_readFramebuffer); glGetIntegerv(GL_RENDERBUFFER_BINDING, &m_renderbuffer); @@ -144,7 +144,7 @@ void GLStateStore::printCurrentState(bool in) if (file->isOpen()) { QDebug msg(file); -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) GLint drawFramebuffer; GLint readFramebuffer; GLint renderbuffer; @@ -183,7 +183,7 @@ void GLStateStore::printCurrentState(bool in) GLfloat polygonOffsetUnits; glGetBooleanv(GL_DEPTH_WRITEMASK, &isDepthWriteEnabled); -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &drawFramebuffer); glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &readFramebuffer); glGetIntegerv(GL_RENDERBUFFER_BINDING, &renderbuffer); @@ -226,7 +226,7 @@ void GLStateStore::printCurrentState(bool in) color.setRgbF(clearColor[0], clearColor[1], clearColor[2]); color.setAlphaF(clearColor[3]); -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) msg << "---" << endl; msg << " GL_DRAW_FRAMEBUFFER_BINDING "<< drawFramebuffer << endl; msg << " GL_READ_FRAMEBUFFER_BINDING "<< readFramebuffer << endl; @@ -278,7 +278,7 @@ void GLStateStore::printCurrentState(bool in) void GLStateStore::restoreGLState() { -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) glBindFramebuffer(GL_READ_FRAMEBUFFER, m_readFramebuffer); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_drawFramebuffer); glBindRenderbuffer(GL_RENDERBUFFER_BINDING, m_renderbuffer); @@ -353,7 +353,7 @@ void GLStateStore::restoreGLState() void GLStateStore::initGLDefaultState() { -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) m_drawFramebuffer = 0; m_readFramebuffer = 0; m_renderbuffer = 0; diff --git a/src/datavisualizationqml2/glstatestore_p.h b/src/datavisualizationqml2/glstatestore_p.h index 830f5e64..f5aa0bdd 100644 --- a/src/datavisualizationqml2/glstatestore_p.h +++ b/src/datavisualizationqml2/glstatestore_p.h @@ -63,7 +63,7 @@ public: GLint m_scissorBox[4]; GLboolean m_isScissorTestEnabled; -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) GLint m_drawFramebuffer; GLint m_readFramebuffer; GLint m_renderbuffer; |