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 /tests/auto/gui/qopengl | |
| 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 'tests/auto/gui/qopengl')
| -rw-r--r-- | tests/auto/gui/qopengl/tst_qopengl.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp index ca12461efa..7236c22fd0 100644 --- a/tests/auto/gui/qopengl/tst_qopengl.cpp +++ b/tests/auto/gui/qopengl/tst_qopengl.cpp @@ -57,7 +57,7 @@ #include <QtPlatformHeaders/QGLXNativeContext> #endif -#if defined(Q_OS_WIN32) && !defined(QT_OPENGL_ES_2) +#if defined(Q_OS_WIN32) && !QT_CONFIG(opengles2) #include <QtPlatformHeaders/QWGLNativeContext> #endif @@ -107,7 +107,7 @@ private slots: void glxContextWrap(); #endif -#if defined(Q_OS_WIN32) && !defined(QT_OPENGL_ES_2) +#if defined(Q_OS_WIN32) && !QT_CONFIG(opengles2) void wglContextWrap(); #endif @@ -633,7 +633,7 @@ static bool supportsInternalFboFormat(QOpenGLContext *ctx, int glFormat) { if (ctx->format().majorVersion() < 3) return false; -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) if (!ctx->isOpenGLES() && ctx->format().majorVersion() >= 4) { GLint value = -1; auto *vFuncs = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_2_Core>(ctx); @@ -1519,7 +1519,7 @@ void tst_QOpenGL::glxContextWrap() } #endif // USE_GLX -#if defined(Q_OS_WIN32) && !defined(QT_OPENGL_ES_2) +#if defined(Q_OS_WIN32) && !QT_CONFIG(opengles2) void tst_QOpenGL::wglContextWrap() { QScopedPointer<QOpenGLContext> ctx(new QOpenGLContext); @@ -1572,7 +1572,7 @@ void tst_QOpenGL::wglContextWrap() QVERIFY(adopted->makeCurrent(window.data())); adopted->doneCurrent(); } -#endif // Q_OS_WIN32 && !QT_OPENGL_ES_2 +#endif // Q_OS_WIN32 && !QT_CONFIG(opengles2) void tst_QOpenGL::vaoCreate() { |