diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-15 09:21:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-15 09:21:53 (GMT) |
| commit | 1276390941efc9625342f769d9ba0aa405bc53a1 (patch) | |
| tree | 0f39a012250c73d83b7bea2576ea55d3250a0286 /src/gui/kernel/qplatformglcontext_qpa.cpp | |
| parent | 662174b78b7e08c759d0086e215e81e9e0eaf0c5 (diff) | |
| parent | e90c655dc88776947a0e98cc21f8e49069b09a45 (diff) | |
| download | Qt-1276390941efc9625342f769d9ba0aa405bc53a1.zip Qt-1276390941efc9625342f769d9ba0aa405bc53a1.tar.gz Qt-1276390941efc9625342f769d9ba0aa405bc53a1.tar.bz2 | |
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (94 commits)
Lighthouse: Fix license headers
Remove hasOpenGL. This changes breaks binary compatibillity
Lighthouse: Fix license headers
Compile fix for shared context change.
Some virtual keyboard text input for uikit.
Wayland: Conform with the api change in the frame callback
Fix configure for Lighthouse
Remove DefaultSharedContext from Lighthouse API.
Make readEvents() non-blocking
Wayland: Show what backend is being used
Wayland: Tell what backend we use for xcomposite glx
Wayland: compile fix after making the event handling
Make the xcomposite the default gl integration backend
Make sure the global listener gets registered even when using drm.
Wayland: Rename XPixmap GL integrations to Readback
Adapt drag distance for uikit.
Prevented crash due to dangling pointer in QWaylandInputDevice.
Fixed logical error in XCB backend.
Set the _NET_WM_WINDOW_TYPE property in the XCB backend.
Added _NET_WM_PID in XCB backend.
...
Diffstat (limited to 'src/gui/kernel/qplatformglcontext_qpa.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformglcontext_qpa.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/gui/kernel/qplatformglcontext_qpa.cpp b/src/gui/kernel/qplatformglcontext_qpa.cpp index 86740e8..1810532 100644 --- a/src/gui/kernel/qplatformglcontext_qpa.cpp +++ b/src/gui/kernel/qplatformglcontext_qpa.cpp @@ -125,24 +125,6 @@ QPlatformGLContext::~QPlatformGLContext() } - -/*! - Makes it possible to set the context which can be the default for making new contexts. -*/ -void QPlatformGLContext::setDefaultSharedContext(QPlatformGLContext *sharedContext) -{ - QPlatformGLContextPrivate::staticSharedContext = sharedContext; -} - -/*! - 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; -*/ -QPlatformGLContext *QPlatformGLContext::defaultSharedContext() -{ - return QPlatformGLContextPrivate::staticSharedContext; -} - /*! Reimplement in subclass to do makeCurrent on native GL context */ |