diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-08 16:27:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-08 16:27:24 (GMT) |
| commit | 8f52cddb714fbdd616c813045e8ca1f96851bdfc (patch) | |
| tree | 40b0210235052e9d23d990c11452d7ce7b603371 /src/opengl | |
| parent | ab4002004b59aaa900962d5e39c8186e909f327f (diff) | |
| parent | f037c0e87d186a01f07cb9aa360dcc496d11145e (diff) | |
| download | Qt-8f52cddb714fbdd616c813045e8ca1f96851bdfc.zip Qt-8f52cddb714fbdd616c813045e8ca1f96851bdfc.tar.gz Qt-8f52cddb714fbdd616c813045e8ca1f96851bdfc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase.
Committing the qt-webpages.qdoc file with the online links
Preparing documentation package for 4.8-beta
Doc: Clarified the range of return values from QLineF::angle().
Doc: Fixed \since declarations. (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
Doc: Standardized on QtQuick for \since declarations. (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
Doc: Removed whitespace. (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
Modified \since command behavior slightly to handle project and version.
Doc: Added a simple introduction to Qt and fixed links. (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
Doc: Added more appropriate links to help reduce confusion.
Doc: Removed non-ASCII characters from the documentation. (cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
Doc: Updated documentation with \since 4.8 declarations.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_qpa.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 9ba8b75..518c860 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -53,6 +53,8 @@ QT_BEGIN_NAMESPACE /*! + \since 4.8 + Returns an OpenGL format for the platform window format specified by \a format. */ QGLFormat QGLFormat::fromPlatformWindowFormat(const QPlatformWindowFormat &format) @@ -87,6 +89,8 @@ QGLFormat QGLFormat::fromPlatformWindowFormat(const QPlatformWindowFormat &forma } /*! + \since 4.8 + Returns a platform window format for the OpenGL format specified by \a format. */ QPlatformWindowFormat QGLFormat::toPlatformWindowFormat(const QGLFormat &format) @@ -387,6 +391,8 @@ QGLContext::QGLContext(QPlatformGLContext *platformContext) } /*! + \since 4.8 + Returns a OpenGL context for the platform-specific OpenGL context given by \a platformContext. */ |