3 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
index 5831b33974..ba2528d3cf 100644
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ b/tests/auto/opengl/qgl/tst_qgl.cpp
@@ -754,7 +754,7 @@ void tst_QGL::openGLVersionCheck()
 #elif defined(QT_OPENGL_ES_2)
     QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0);
 #else
-    if (QOpenGLContext::currentContext()->isES())
+    if (QOpenGLContext::currentContext()->isOpenGLES())
         QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_ES_Version_2_0);
     else
         QVERIFY(QGLFormat::openGLVersionFlags() & QGLFormat::OpenGL_Version_1_1);
@@ -1552,7 +1552,7 @@ void tst_QGL::fboFormat()
 #ifdef QT_OPENGL_ES_2
         GL_RGBA;
 #else
-        QOpenGLContext::openGLModuleType() != QOpenGLContext::DesktopGL ? GL_RGBA : GL_RGBA8;
+        QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ? GL_RGBA : GL_RGBA8;
 #endif
     QCOMPARE(int(format1.internalTextureFormat()), expectedFormat);
 
@@ -1629,7 +1629,7 @@ void tst_QGL::fboFormat()
 #ifdef QT_OPENGL_ES_2
         GL_RGBA
 #else
-        QOpenGLContext::openGLModuleType() != QOpenGLContext::DesktopGL ? GL_RGBA : GL_RGBA8
+        QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ? GL_RGBA : GL_RGBA8
 #endif
         );
     QVERIFY(!(format1c == format3c));
@@ -1642,7 +1642,7 @@ void tst_QGL::fboFormat()
 #ifdef QT_OPENGL_ES_2
         GL_RGBA
 #else
-        QOpenGLContext::openGLModuleType() != QOpenGLContext::DesktopGL ? GL_RGBA : GL_RGBA8
+        QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL ? GL_RGBA : GL_RGBA8
 #endif
         );
     QVERIFY(!(format1c == format4c));
@@ -2417,10 +2417,10 @@ void tst_QGL::extensions()
         QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Shaders));
         QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Buffers));
         QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Multisample));
-        QVERIFY(!ctx->isES() || allFeatures.testFlag(QOpenGLFunctions::Framebuffers));
+        QVERIFY(!ctx->isOpenGLES() || allFeatures.testFlag(QOpenGLFunctions::Framebuffers));
         QVERIFY(allFeatures.testFlag(QOpenGLFunctions::NPOTTextures)
                 && allFeatures.testFlag(QOpenGLFunctions::NPOTTextureRepeat));
-        if (ctx->isES()) {
+        if (ctx->isOpenGLES()) {
             QVERIFY(!allFeatures.testFlag(QOpenGLFunctions::FixedFunctionPipeline));
             QVERIFY(allFeatures.testFlag(QOpenGLFunctions::Framebuffers));
         }
diff --git a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
index cdd820cf5b..2f09d84772 100644
--- a/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
+++ b/tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp
@@ -96,7 +96,7 @@ void tst_QGLFunctions::features()
     funcs.initializeGLFunctions();
 
     // Validate the features against what we expect for this platform.
-    if (QOpenGLContext::currentContext()->isES()) {
+    if (QOpenGLContext::currentContext()->isOpenGLES()) {
 #if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_ES_2)
         QGLFunctions::OpenGLFeatures allFeatures =
             (QGLFunctions::Multitexture |
diff --git a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
index 999761e3f0..70e3a3b62a 100644
--- a/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/opengl/qglthreads/tst_qglthreads.cpp
@@ -339,7 +339,7 @@ static inline float qrandom() { return (rand() % 100) / 100.f; }
 
 void renderAScene(int w, int h)
 {
-    if (QOpenGLContext::currentContext()->isES()) {
+    if (QOpenGLContext::currentContext()->isOpenGLES()) {
         QGLFunctions funcs(QGLContext::currentContext());
         Q_UNUSED(w);
         Q_UNUSED(h);