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

1 files changed, 6 insertions, 3 deletions

diff --git a/src/gui/painting/qwindowsurface_x11.cpp b/src/gui/painting/qwindowsurface_x11.cpp
index ab4f53e..deb83b4 100644
--- a/src/gui/painting/qwindowsurface_x11.cpp
+++ b/src/gui/painting/qwindowsurface_x11.cpp
@@ -250,13 +250,16 @@ QPixmap QX11WindowSurface::grabWidget(const QWidget *widget,
     return px;
 }
 
-bool QX11WindowSurface::hasStaticContentsSupport() const
+QWindowSurface::WindowSurfaceFeatures QX11WindowSurface::features() const
 {
+    WindowSurfaceFeatures features = QWindowSurface::PartialUpdates | QWindowSurface::PreservedContents;
 #ifndef QT_NO_XRENDER
-    return !d_ptr->translucentBackground;
+    if (!d_ptr->translucentBackground)
+        features |= QWindowSurface::StaticContents;
 #else
-    return true;
+    features |= QWindowSurface::StaticContents;
 #endif
+    return features;
 }
 
 QT_END_NAMESPACE