4 files changed, 85 insertions, 3 deletions

diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp
index fe1861e08b1..0af32954306 100644
--- a/src/gui/kernel/qplatformintegration.cpp
+++ b/src/gui/kernel/qplatformintegration.cpp
@@ -237,6 +237,10 @@ QPlatformServices *QPlatformIntegration::services() const
     is required to have this capability.
 
     \value ApplicationIcon The platform supports setting the application icon. (since 5.5)
+
+    \value TopStackedNativeChildWindows The platform supports native child windows via
+    QWindowContainer without having to punch a transparent hole in the
+    backingstore. (since 5.10)
  */
 
 /*!
@@ -260,7 +264,8 @@ QPlatformServices *QPlatformIntegration::services() const
 
 bool QPlatformIntegration::hasCapability(Capability cap) const
 {
-    return cap == NonFullScreenWindows || cap == NativeWidgets || cap == WindowManagement;
+    return cap == NonFullScreenWindows || cap == NativeWidgets || cap == WindowManagement
+        || cap == TopStackedNativeChildWindows;
 }
 
 QPlatformPixmap *QPlatformIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const
diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h
index 0449e0b4c84..54904ef60de 100644
--- a/src/gui/kernel/qplatformintegration.h
+++ b/src/gui/kernel/qplatformintegration.h
@@ -99,7 +99,8 @@ public:
         RasterGLSurface,
         AllGLFunctionsQueryable,
         ApplicationIcon,
-        SwitchableWidgetComposition
+        SwitchableWidgetComposition,
+        TopStackedNativeChildWindows
     };
 
     virtual ~QPlatformIntegration() { }
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index 000d727380a..574310f5548 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -73,6 +73,7 @@ public:
         , major(2)
         , minor(0)
         , swapInterval(1) // default to vsync
+        , colorSpace(QSurfaceFormat::DefaultColorSpace)
     {
     }
 
@@ -91,7 +92,8 @@ public:
           profile(other->profile),
           major(other->major),
           minor(other->minor),
-          swapInterval(other->swapInterval)
+          swapInterval(other->swapInterval),
+          colorSpace(other->colorSpace)
     {
     }
 
@@ -110,6 +112,7 @@ public:
     int major;
     int minor;
     int swapInterval;
+    QSurfaceFormat::ColorSpace colorSpace;
 };
 
 /*!
@@ -124,6 +127,12 @@ public:
     contains surface configuration parameters such as OpenGL profile and
     version for rendering, whether or not to enable stereo buffers, and swap
     behaviour.
+
+    \note When troubleshooting context or window format issues, it can be
+    helpful to enable the logging category \c{qt.qpa.gl}. Depending on the
+    platform, this may print useful debug information when it comes to OpenGL
+    initialization and the native visual or framebuffer configurations which
+    QSurfaceFormat gets mapped to.
 */
 
 /*!
@@ -199,6 +208,22 @@ public:
 */
 
 /*!
+    \enum QSurfaceFormat::ColorSpace
+
+    This enum is used to specify the preferred color space, controlling if the
+    window's associated default framebuffer is able to do updates and blending
+    in a given encoding instead of the standard linear operations.
+
+    \value DefaultColorSpace The default, unspecified color space.
+
+    \value sRGBColorSpace When \c{GL_ARB_framebuffer_sRGB} or
+    \c{GL_EXT_framebuffer_sRGB} is supported by the platform and this value is
+    set, the window will be created with an sRGB-capable default
+    framebuffer. Note that some platforms may return windows with a sRGB-capable
+    default framebuffer even when not requested explicitly.
+ */
+
+/*!
     Constructs a default initialized QSurfaceFormat.
 
     \note By default OpenGL 2.0 is requested since this provides the highest
@@ -736,6 +761,47 @@ int QSurfaceFormat::swapInterval() const
     return d->swapInterval;
 }
 
+/*!
+    Sets the preferred \a colorSpace.
+
+    For example, this allows requesting windows with default framebuffers that
+    are sRGB-capable on platforms that support it.
+
+    \note When the requested color space is not supported by the platform, the
+    request is ignored. Query the QSurfaceFormat after window creation to verify
+    if the color space request could be honored or not.
+
+    \note This setting controls if the default framebuffer of the window is
+    capable of updates and blending in a given color space. It does not change
+    applications' output by itself. The applications' rendering code will still
+    have to opt in via the appropriate OpenGL calls to enable updates and
+    blending to be performed in the given color space instead of using the
+    standard linear operations.
+
+    \since 5.10
+
+    \sa colorSpace()
+ */
+void QSurfaceFormat::setColorSpace(ColorSpace colorSpace)
+{
+    if (d->colorSpace != colorSpace) {
+        detach();
+        d->colorSpace = colorSpace;
+    }
+}
+
+/*!
+    \return the color space.
+
+    \since 5.10
+
+    \sa setColorSpace()
+*/
+QSurfaceFormat::ColorSpace QSurfaceFormat::colorSpace() const
+{
+    return d->colorSpace;
+}
+
 Q_GLOBAL_STATIC(QSurfaceFormat, qt_default_surface_format)
 
 /*!
@@ -841,6 +907,7 @@ QDebug operator<<(QDebug dbg, const QSurfaceFormat &f)
                   << ", samples " << d->numSamples
                   << ", swapBehavior " << d->swapBehavior
                   << ", swapInterval " << d->swapInterval
+                  << ", colorSpace " << d->colorSpace
                   << ", profile  " << d->profile
                   << ')';
 
diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h
index 246163609ef..ed63eb8bbf0 100644
--- a/src/gui/kernel/qsurfaceformat.h
+++ b/src/gui/kernel/qsurfaceformat.h
@@ -85,6 +85,12 @@ public:
     };
     Q_ENUM(OpenGLContextProfile)
 
+    enum ColorSpace {
+        DefaultColorSpace,
+        sRGBColorSpace
+    };
+    Q_ENUM(ColorSpace)
+
     QSurfaceFormat();
     /*implicit*/ QSurfaceFormat(FormatOptions options);
     QSurfaceFormat(const QSurfaceFormat &other);
@@ -145,6 +151,9 @@ public:
     int swapInterval() const;
     void setSwapInterval(int interval);
 
+    ColorSpace colorSpace() const;
+    void setColorSpace(ColorSpace colorSpace);
+
     static void setDefaultFormat(const QSurfaceFormat &format);
     static QSurfaceFormat defaultFormat();