From b099ca979c3134adbffdb7d76b63f8661e6abde7 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 14 Aug 2020 13:08:59 +0200 Subject: Use QT_CONFIG for opengl_es_2 ifdefs Change-Id: If59bb6ef785a3ae424a9036c8c9586ca15ba1b77 Reviewed-by: Miikka Heikkinen --- src/charts/glwidget.cpp | 2 +- src/chartsqml2/declarativeopenglrendernode.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/charts/glwidget.cpp b/src/charts/glwidget.cpp index a712b7b4..e30a064c 100644 --- a/src/charts/glwidget.cpp +++ b/src/charts/glwidget.cpp @@ -167,7 +167,7 @@ void GLWidget::initializeGL() glDisable(GL_DEPTH_TEST); glDisable(GL_STENCIL_TEST); -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) if (!QOpenGLContext::currentContext()->isOpenGLES()) { // Make it possible to change point primitive size and use textures with them in // the shaders. These are implicitly enabled in ES2. diff --git a/src/chartsqml2/declarativeopenglrendernode.cpp b/src/chartsqml2/declarativeopenglrendernode.cpp index d3df3a43..c4eed664 100644 --- a/src/chartsqml2/declarativeopenglrendernode.cpp +++ b/src/chartsqml2/declarativeopenglrendernode.cpp @@ -156,7 +156,7 @@ void DeclarativeOpenGLRenderNode::initGL() m_vao.create(); QOpenGLVertexArrayObject::Binder vaoBinder(&m_vao); -#if !defined(QT_OPENGL_ES_2) +#if !QT_CONFIG(opengles2) if (!QOpenGLContext::currentContext()->isOpenGLES()) { // Make it possible to change point primitive size and use textures with them in // the shaders. These are implicitly enabled in ES2. -- cgit v1.2.3