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