diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-06-27 08:47:01 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-06-27 08:47:01 (GMT) |
| commit | 9f3fc0e9ce48c52c33c0ea9ff3f8b04d0c276267 (patch) | |
| tree | e7d472a44f7b1c95961f8f31d792e8a04cf66c34 /src/opengl/qgl_qpa.cpp | |
| parent | f078275a2a4b2a279a6fcc24df3c21fe8b21f007 (diff) | |
| parent | 36a464681a349a0915f821786b4617695c1d02d4 (diff) | |
| download | Qt-9f3fc0e9ce48c52c33c0ea9ff3f8b04d0c276267.zip Qt-9f3fc0e9ce48c52c33c0ea9ff3f8b04d0c276267.tar.gz Qt-9f3fc0e9ce48c52c33c0ea9ff3f8b04d0c276267.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/opengl/qgl_qpa.cpp')
| -rw-r--r-- | src/opengl/qgl_qpa.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index f8f3974..9ba8b75 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -52,6 +52,9 @@ QT_BEGIN_NAMESPACE +/*! + Returns an OpenGL format for the platform window format specified by \a format. +*/ QGLFormat QGLFormat::fromPlatformWindowFormat(const QPlatformWindowFormat &format) { QGLFormat retFormat; @@ -83,6 +86,9 @@ QGLFormat QGLFormat::fromPlatformWindowFormat(const QPlatformWindowFormat &forma return retFormat; } +/*! + Returns a platform window format for the OpenGL format specified by \a format. +*/ QPlatformWindowFormat QGLFormat::toPlatformWindowFormat(const QGLFormat &format) { QPlatformWindowFormat retFormat; @@ -380,6 +386,10 @@ QGLContext::QGLContext(QPlatformGLContext *platformContext) d->setupSharing(); } +/*! + Returns a OpenGL context for the platform-specific OpenGL context given by + \a platformContext. +*/ QGLContext *QGLContext::fromPlatformGLContext(QPlatformGLContext *platformContext) { if (!platformContext) |