From b6a6d590e9beb341817f6940d7607dbb845a2410 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 2 Jul 2013 19:39:49 +0200 Subject: [PATCH] Fix documentation of the QOpenGLFunctions::OpenGLFeature enum It's not really about features already present in OpenGL ES 2 that might not be present in other OpenGL implementations; for instance, NPOT textures are not in ES 2, but only available through extensions. Therefore, change the wording to include optional OpenGL and OpenGL ES features. Change-Id: I3822e50789ded10a937e3c5b7b4be9e267265276 Reviewed-by: Sean Harmer --- src/gui/opengl/qopenglfunctions.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 3737df7497..5c7af6e474 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -141,8 +141,8 @@ QT_BEGIN_NAMESPACE /*! \enum QOpenGLFunctions::OpenGLFeature - This enum defines OpenGL/ES 2.0 features that may be optional - on other platforms. + This enum defines OpenGL and OpenGL ES features whose presence + may depend on the implementation. \value Multitexture glActiveTexture() function is available. \value Shaders Shader functions are available.