Added WindowSurfaceFeature enum to QWindowSurface.

Now that we've added hasPreservedContents() it's cleaner to convert the
various features to feature flags, which is also more extensible in case
more flags are needed in the future.

Reviewed-by: Bjørn Erik Nilsen

2 files changed, 8 insertions, 9 deletions

diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 4682d0d..3815f7b 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -1154,14 +1154,14 @@ QImage *QGLWindowSurface::buffer(const QWidget *widget)
     return &d_ptr->buffers.last();
 }
 
-bool QGLWindowSurface::hasPartialUpdateSupport() const
+QWindowSurface::WindowSurfaceFeatures QGLWindowSurface::features() const
 {
-    return !d_ptr->destructive_swap_buffers || d_ptr->swap_region_support;
-}
-
-bool QGLWindowSurface::hasPreservedContents() const
-{
-    return !d_ptr->destructive_swap_buffers;
+    WindowSurfaceFeatures features = 0;
+    if (!d_ptr->destructive_swap_buffers || d_ptr->swap_region_support)
+        features |= PartialUpdates;
+    if (!d_ptr->destructive_swap_buffers)
+        features |= PreservedContents;
+    return features;
 }
 
 QT_END_NAMESPACE
diff --git a/src/opengl/qwindowsurface_gl_p.h b/src/opengl/qwindowsurface_gl_p.h
index cabb35a..4ad8339 100644
--- a/src/opengl/qwindowsurface_gl_p.h
+++ b/src/opengl/qwindowsurface_gl_p.h
@@ -108,8 +108,7 @@ public:
 
     QImage *buffer(const QWidget *widget);
 
-    bool hasPartialUpdateSupport() const;
-    bool hasPreservedContents() const;
+    WindowSurfaceFeatures features() const;
 
     QGLContext *context() const;