From ff193e33d80a08ca0c21fdbccc2d63e6b7400d88 Mon Sep 17 00:00:00 2001
From: Tuomo Pelkonen <tuomo.pelkonen@gmail.com>
Date: Mon, 18 Jan 2021 19:03:07 +0200
Subject: Fix compilation issues for macOS and Android on Qt 6.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-89297
Change-Id: I57acf345b6fc64a93d08d41016c755cae4edd6db
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
---
 src/datavisualization/engine/abstract3drenderer.cpp | 8 +++++---
 src/datavisualization/engine/abstract3drenderer_p.h | 4 ++--
 src/datavisualization/engine/drawer.cpp             | 6 +++---
 src/datavisualization/engine/scatter3drenderer.cpp  | 8 ++++----
 4 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'src/datavisualization/engine')

diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index fd81e930..b45cd756 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -118,7 +118,7 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
       m_oldCameraTarget(QVector3D(2000.0f, 2000.0f, 2000.0f)), // Just random invalid target
       m_reflectionEnabled(false),
       m_reflectivity(0.5),
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
       m_funcs_2_1(0),
 #endif
       m_context(0),
@@ -127,7 +127,7 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller)
 {
     initializeOpenGLFunctions();
     m_isOpenGLES = Utils::isOpenGLES();
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
     if (!m_isOpenGLES) {
         // Discard warnings about deprecated functions
         QtMessageHandler handler = qInstallMessageHandler(discardDebugMsgs);
@@ -193,7 +193,9 @@ Abstract3DRenderer::~Abstract3DRenderer()
     m_axisCacheY.clearLabels();
     m_axisCacheZ.clearLabels();
 
+#if !QT_CONFIG(opengles2)
     delete m_funcs_2_1;
+#endif
 }
 
 void Abstract3DRenderer::contextCleanup()
@@ -212,7 +214,7 @@ void Abstract3DRenderer::initializeOpenGL()
     glEnable(GL_CULL_FACE);
     glCullFace(GL_BACK);
 
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
     if (!m_isOpenGLES) {
         glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
         glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index 4155a551..bc7ca819 100644
--- a/src/datavisualization/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -41,7 +41,7 @@
 #define ABSTRACT3DRENDERER_P_H
 
 #include <QtGui/QOpenGLFunctions>
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
 #  include <QtOpenGL/QOpenGLFunctions_2_1>
 #endif
 #include "datavisualizationglobal_p.h"
@@ -333,7 +333,7 @@ protected:
     qreal m_reflectivity;
 
     QLocale m_locale;
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
     QOpenGLFunctions_2_1 *m_funcs_2_1;
 #endif
     QPointer<QOpenGLContext> m_context; // Not owned
diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp
index 3b873ba4..8d7cdf6e 100644
--- a/src/datavisualization/engine/drawer.cpp
+++ b/src/datavisualization/engine/drawer.cpp
@@ -105,7 +105,7 @@ QFont Drawer::font() const
 void Drawer::drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLuint textureId,
                         GLuint depthTextureId, GLuint textureId3D)
 {
-#if defined(QT_OPENGL_ES_2)
+#if QT_CONFIG(opengles2)
     Q_UNUSED(textureId3D);
 #endif
     if (textureId) {
@@ -121,7 +121,7 @@ void Drawer::drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLui
         glBindTexture(GL_TEXTURE_2D, depthTextureId);
         shader->setUniformValue(shader->shadow(), 1);
     }
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
     if (textureId3D) {
         // Activate texture
         glActiveTexture(GL_TEXTURE2);
@@ -166,7 +166,7 @@ void Drawer::drawObject(ShaderHelper *shader, AbstractObjectHelper *object, GLui
     glDisableVertexAttribArray(shader->posAtt());
 
     // Release textures
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
     if (textureId3D) {
         glActiveTexture(GL_TEXTURE2);
         glBindTexture(GL_TEXTURE_3D, 0);
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index e999827e..5255b51e 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -554,7 +554,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
 
     ShaderHelper *pointSelectionShader;
     if (!m_isOpenGLES) {
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
         if (m_havePointSeries) {
             glEnable(GL_POINT_SMOOTH);
             glEnable(GL_PROGRAM_POINT_SIZE);
@@ -751,7 +751,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                 float itemSize = cache->itemSize() / itemScaler;
                 if (itemSize == 0.0f)
                     itemSize = m_dotSizeScale;
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
                 if (drawingPoints && !m_isOpenGLES)
                     m_funcs_2_1->glPointSize(itemSize * activeCamera->zoomLevel());
 #endif
@@ -884,7 +884,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
             float itemSize = cache->itemSize() / itemScaler;
             if (itemSize == 0.0f)
                 itemSize = m_dotSizeScale;
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
             if (drawingPoints && !m_isOpenGLES)
                 m_funcs_2_1->glPointSize(itemSize * activeCamera->zoomLevel());
 #endif
@@ -1195,7 +1195,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         }
     }
 
-#if !defined(QT_OPENGL_ES_2)
+#if !QT_CONFIG(opengles2)
     if (m_havePointSeries) {
         glDisable(GL_POINT_SMOOTH);
         glDisable(GL_PROGRAM_POINT_SIZE);
-- 
cgit v1.2.3