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/datavisualization/engine/abstract3drenderer.cpp | |
| 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/datavisualization/engine/abstract3drenderer.cpp')
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
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); |