diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
| commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
| tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/gui/kernel/qplatformopenglcontext.cpp | |
| parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
| parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/gui/kernel/qplatformopenglcontext.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformopenglcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformopenglcontext.cpp b/src/gui/kernel/qplatformopenglcontext.cpp index 0b30884f06..f4d343d78a 100644 --- a/src/gui/kernel/qplatformopenglcontext.cpp +++ b/src/gui/kernel/qplatformopenglcontext.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE The only place to retrieve a QPlatformOpenGLContext from is through a QPlatformWindow. The context which is current for a specific thread can be collected by the currentContext() - function. This is how QPlatformOpenGLContext also makes it possible to use the QtGui module + function. This is how QPlatformOpenGLContext also makes it possible to use the Qt GUI module withhout using QOpenGLWidget. When using QOpenGLContext::currentContext(), it will ask QPlatformOpenGLContext for the currentContext. Then a corresponding QOpenGLContext will be returned, which maps to the QPlatformOpenGLContext. |