diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-20 07:44:27 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-25 18:07:35 (GMT) |
| commit | 37207d16cb51616c0b506dcc57126ff06c9073a9 (patch) | |
| tree | e6079db4b9f9e1ee014d14086be79b6967adf98a /src/gui | |
| parent | fd28a6ab14fc3c54c443718d405eeb9f98c7dd27 (diff) | |
| download | Qt-37207d16cb51616c0b506dcc57126ff06c9073a9.zip Qt-37207d16cb51616c0b506dcc57126ff06c9073a9.tar.gz Qt-37207d16cb51616c0b506dcc57126ff06c9073a9.tar.bz2 | |
Make QGLContext::fromPlatformGLContext show correct sharing
information. Prior to this, if a context was created with QGLWidget it
would setup the sharing correct, but all sharing actually created on a
QPlatformGLContext level was ignored by the QGLContext, thus indicating
that it wasnt sharing with any other context.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qplatformglcontext_qpa.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformglcontext_qpa.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformglcontext_qpa.cpp b/src/gui/kernel/qplatformglcontext_qpa.cpp index 14bd718..1673aed 100644 --- a/src/gui/kernel/qplatformglcontext_qpa.cpp +++ b/src/gui/kernel/qplatformglcontext_qpa.cpp @@ -138,7 +138,7 @@ void QPlatformGLContext::setDefaultSharedContext(QPlatformGLContext *sharedConte Default shared context is intended to be a globally awailable pointer to a context which can be used for sharing resources when creating new contexts. Its default value is 0; */ -const QPlatformGLContext *QPlatformGLContext::defaultSharedContext() +QPlatformGLContext *QPlatformGLContext::defaultSharedContext() { return QPlatformGLContextPrivate::staticSharedContext; } diff --git a/src/gui/kernel/qplatformglcontext_qpa.h b/src/gui/kernel/qplatformglcontext_qpa.h index a70e046..807ed3d 100644 --- a/src/gui/kernel/qplatformglcontext_qpa.h +++ b/src/gui/kernel/qplatformglcontext_qpa.h @@ -69,7 +69,7 @@ public: virtual QPlatformWindowFormat platformWindowFormat() const = 0; const static QPlatformGLContext *currentContext(); - const static QPlatformGLContext *defaultSharedContext(); + static QPlatformGLContext *defaultSharedContext(); protected: |