diff options
Diffstat (limited to 'src/plugins/platforms')
3 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp index 4ae087dfaa..d0b3568dad 100644 --- a/src/plugins/platforms/windows/qwindowseglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp @@ -44,7 +44,7 @@ #include <QtCore/qdebug.h> #include <QtGui/qopenglcontext.h> -#if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC) +#if QT_CONFIG(angle) || defined(QT_OPENGL_DYNAMIC) # include <EGL/eglext.h> #endif diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 2c87e80ec7..9add72d266 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -84,10 +84,10 @@ #include <limits.h> -#if defined(QT_OPENGL_ES_2) || defined(QT_OPENGL_DYNAMIC) +#if QT_CONFIG(opengles2) || defined(QT_OPENGL_DYNAMIC) # include "qwindowseglcontext.h" #endif -#if !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2) +#if !defined(QT_NO_OPENGL) && !QT_CONFIG(opengles2) # include "qwindowsglcontext.h" #endif @@ -455,7 +455,7 @@ QWindowsStaticOpenGLContext *QWindowsStaticOpenGLContext::doCreate() return eglCtx; } return QOpenGLStaticContext::create(true); -#elif defined(QT_OPENGL_ES_2) +#elif QT_CONFIG(opengles2) QWindowsOpenGLTester::Renderers glesRenderers = QWindowsOpenGLTester::requestedGlesRenderer(); if (glesRenderers == QWindowsOpenGLTester::InvalidRenderer) glesRenderers = QWindowsOpenGLTester::supportedRenderers(QWindowsOpenGLTester::AngleRendererD3d11); @@ -483,7 +483,7 @@ QPlatformOpenGLContext *QWindowsIntegration::createPlatformOpenGLContext(QOpenGL QOpenGLContext::OpenGLModuleType QWindowsIntegration::openGLModuleType() { -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) return QOpenGLContext::LibGLES; #elif !defined(QT_OPENGL_DYNAMIC) return QOpenGLContext::LibGL; diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index 75189a9c80..0fd421e925 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -241,7 +241,7 @@ QGLXContext::QGLXContext(QXcbScreen *screen, const QSurfaceFormat &format, QPlat void QGLXContext::init(QXcbScreen *screen, QPlatformOpenGLContext *share) { if (m_format.renderableType() == QSurfaceFormat::DefaultRenderableType) -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) m_format.setRenderableType(QSurfaceFormat::OpenGLES); #else m_format.setRenderableType(QSurfaceFormat::OpenGL); |