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