diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/gui/opengl/qopenglfunctions.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/gui/opengl/qopenglfunctions.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglfunctions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 60591a34d20..a4ed74637ca 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -403,7 +403,7 @@ QOpenGLFunctions::OpenGLFeatures QOpenGLFunctions::openGLFeatures() const } /*! - Returns true if \a feature is present on this system's OpenGL + Returns \c true if \a feature is present on this system's OpenGL implementation; false otherwise. It is assumed that the QOpenGLContext associated with this function @@ -441,7 +441,7 @@ QOpenGLExtensions::OpenGLExtensions QOpenGLExtensions::openGLExtensions() } /*! - Returns true if \a extension is present on this system's OpenGL + Returns \c true if \a extension is present on this system's OpenGL implementation; false otherwise. It is assumed that the QOpenGLContext associated with this extension |