Enabling QQuickWidget and QOpenGLWidget

Enable child widgets (without a native window) that render to an FBO
and are composed with the raster backingstore by the platform plugin.
A preliminary version of QOpenGLWidget is included as private API.

Change-Id: I8f984a4d7db285069ce3d6564707942c823d890d
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/src/gui/kernel/qsurface.cpp b/src/gui/kernel/qsurface.cpp
index a943639d5f..a27bdaccde 100644
--- a/src/gui/kernel/qsurface.cpp
+++ b/src/gui/kernel/qsurface.cpp
@@ -74,6 +74,9 @@ QT_BEGIN_NAMESPACE
     a software rasterizer like Qt's raster paint engine.
     \value OpenGLSurface The surface is an OpenGL compatible surface and can be used
     in conjunction with QOpenGLContext.
+    \value RasterGLSurface The surface can be rendered to using a software rasterizer,
+    and also supports OpenGL. This surface type is intended for internal Qt use, and
+    requires the use of private API.
  */
 
 
@@ -84,6 +87,19 @@ QT_BEGIN_NAMESPACE
  */
 
 /*!
+  Returns true if the surface is OpenGL compatible and can be used in
+  conjunction with QOpenGLContext; otherwise returns false.
+
+  \since 5.3
+*/
+
+bool QSurface::supportsOpenGL() const
+{
+    SurfaceType type = surfaceType();
+    return type == OpenGLSurface || type == RasterGLSurface;
+}
+
+/*!
     \fn QPlatformSurface *QSurface::surfaceHandle() const
 
     Returns a handle to the platform-specific implementation of the surface.