diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2012-05-29 15:23:25 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 18:48:00 +0200 |
commit | e1774d202912b5d053872f242c61d964a5d69450 (patch) | |
tree | 2db13710c7d5979e5b49639b9ed5ef3f566a2beb /src/gui/kernel/qplatformsurface.h | |
parent | 7d28f7772cd8f5aad63359ed0b9c57c12923dc85 (diff) |
Verify the surfaceType before activating the GL context
Verify that the surfaceType() of the QPlatformContext is of type
OpenGLSurface before making the context active. Make it possible
to get the QSurface from a QPlatformSurface, make QPlatformWindow
use that to access the QWindow. Remove the setSurfaceType call from
the eglfs plugin as this hiding a problem.
Change-Id: I08906da052e066bb1f1f042030643c6389ab17d7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/gui/kernel/qplatformsurface.h')
-rw-r--r-- | src/gui/kernel/qplatformsurface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qplatformsurface.h b/src/gui/kernel/qplatformsurface.h index a10ae6f1e5..b902f9b1f6 100644 --- a/src/gui/kernel/qplatformsurface.h +++ b/src/gui/kernel/qplatformsurface.h @@ -66,12 +66,12 @@ public: virtual ~QPlatformSurface(); virtual QSurfaceFormat format() const = 0; - QSurface::SurfaceClass surfaceClass() const; + QSurface *surface() const; private: - explicit QPlatformSurface(QSurface::SurfaceClass type); + explicit QPlatformSurface(QSurface *surface); - QSurface::SurfaceClass m_type; + QSurface *m_surface; friend class QPlatformWindow; }; |