diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-14 13:48:28 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-17 11:50:24 +0200 |
| commit | ad5aee2e34fad45d1d90bb059fa00a791d4ba3e2 (patch) | |
| tree | 0df5be078e937caf0cec39b312449128300735dc /src/plugins/platforms/windows/qwindowsintegration.cpp | |
| parent | 009d583eef20e7732225cdeae32925ac676d3a47 (diff) | |
Get rid of QT_OPENGL_ES*
The QT_OPENGL_ES* macros are leftovers from an earlier,
ad hoc configuration system, which has since been
replaced by QT_CONFIG. To clean things up in Qt 6,
we use the new way instead.
Task-number: QTBUG-83467
Change-Id: I578dc7695bff9d5ee303b22e44f60fee22fe0c28
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; |