summaryrefslogtreecommitdiffstats
path: root/tests/auto/opengl/qglfunctions
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@digia.com>2014-04-24 17:11:23 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-25 10:07:45 +0200
commitf9d323279a0b3928acf40d56d84e9e5cc2cb7ee9 (patch)
tree3b9f77883fb18c8e54f49ebbb55e7f9761a6aae8 /tests/auto/opengl/qglfunctions
parent93c6976a394275d5fdad6266512925f6c7c94911 (diff)
Rename new QOpenGLContext APIs
isES() becomes isOpenGLES(). The library type enums are changed DesktopGL -> LibGL and GLES2 -> LibGLES. This removes the now unnecessary version number, the confusing "desktop" term and provides better readability. The old function/values are kept until the related qtdeclarative changes are integrated. Task-number: QTBUG-38564 Change-Id: Ibb0a1209985f1ce4bb9451f9b7b093c2b68a6505 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests/auto/opengl/qglfunctions')
-rw-r--r--tests/auto/opengl/qglfunctions/tst_qglfunctions.cpp2
1 files changed, 1 insertions, 1 deletions
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 |