diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-11-05 15:55:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-08 22:47:42 +0100 |
| commit | e24c8d1266fcf42292b48a7dc119dd5f3a217989 (patch) | |
| tree | 374d65b34750473a0a6061207e86501b20f0cd32 /src/gui/kernel/qopenglcontext_p.h | |
| parent | 5f915d0b91bbc3d8c8c31e99f4f6b9e7b341cd90 (diff) | |
Return appropriate currentContext() in platform's makeCurrent().
This way the platform plugin can use convenience classes such as
QOpenGLFramebufferObject in the makeCurrent() implementation.
Change-Id: I1fb5f6b8ec094ff39454adbeca9eb0d1a8f43ee6
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/gui/kernel/qopenglcontext_p.h')
| -rw-r--r-- | src/gui/kernel/qopenglcontext_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h index 704ff09411..efce991679 100644 --- a/src/gui/kernel/qopenglcontext_p.h +++ b/src/gui/kernel/qopenglcontext_p.h @@ -224,7 +224,7 @@ public: QPaintEngineEx *active_engine; - static void setCurrentContext(QOpenGLContext *context); + static QOpenGLContext *setCurrentContext(QOpenGLContext *context); int maxTextureSize(); |