1 files changed, 30 insertions, 11 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_drawing.mm b/src/plugins/platforms/cocoa/qnsview_drawing.mm
index 472a5291e7..bf102e43f8 100644
--- a/src/plugins/platforms/cocoa/qnsview_drawing.mm
+++ b/src/plugins/platforms/cocoa/qnsview_drawing.mm
@@ -13,6 +13,14 @@
             << " QT_MAC_WANTS_LAYER/_q_mac_wantsLayer has no effect.";
     }
 
+    // Pick up and persist requested color space from surface format
+    const QSurfaceFormat surfaceFormat = m_platformWindow->format();
+    if (QColorSpace colorSpace = surfaceFormat.colorSpace(); colorSpace.isValid()) {
+        NSData *iccData = colorSpace.iccProfile().toNSData();
+        self.colorSpace = [[[NSColorSpace alloc] initWithICCProfileData:iccData] autorelease];
+    }
+
+    // Trigger creation of the layer
     self.wantsLayer = YES;
 }
 
@@ -28,6 +36,12 @@
     return YES;
 }
 
+- (NSColorSpace*)colorSpace
+{
+    // If no explicit color space was set, use the NSWindow's color space
+    return m_colorSpace ? m_colorSpace : self.window.colorSpace;
+}
+
 // ----------------------- Layer setup -----------------------
 
 - (BOOL)shouldUseMetalLayer
@@ -93,12 +107,7 @@
 
     [super setLayer:layer];
 
-    // When adding a view to a view hierarchy the backing properties will change
-    // which results in updating the contents scale, but in case of switching the
-    // layer on a view that's already in a view hierarchy we need to manually ensure
-    // the scale is up to date.
-    if (self.superview)
-        [self updateLayerContentsScale];
+    [self propagateBackingProperties];
 
     if (self.opaque && lcQpaDrawing().isDebugEnabled()) {
         // If the view claims to be opaque we expect it to fill the entire
@@ -131,8 +140,7 @@
 {
     qCDebug(lcQpaDrawing) << "Backing properties changed for" << self;
 
-    if (self.layer)
-        [self updateLayerContentsScale];
+    [self propagateBackingProperties];
 
     // Ideally we would plumb this situation through QPA in a way that lets
     // clients invalidate their own caches, recreate QBackingStore, etc.
@@ -141,8 +149,11 @@
     [self setNeedsDisplay:YES];
 }
 
-- (void)updateLayerContentsScale
+- (void)propagateBackingProperties
 {
+    if (!self.layer)
+        return;
+
     // We expect clients to fill the layer with retina aware content,
     // based on the devicePixelRatio of the QWindow, so we set the
     // layer's content scale to match that. By going via devicePixelRatio
@@ -153,6 +164,12 @@
     auto devicePixelRatio = m_platformWindow->devicePixelRatio();
     qCDebug(lcQpaDrawing) << "Updating" << self.layer << "content scale to" << devicePixelRatio;
     self.layer.contentsScale = devicePixelRatio;
+
+    if ([self.layer isKindOfClass:CAMetalLayer.class]) {
+        CAMetalLayer *metalLayer = static_cast<CAMetalLayer *>(self.layer);
+        metalLayer.colorspace = self.colorSpace.CGColorSpace;
+        qCDebug(lcQpaDrawing) << "Set" << metalLayer << "color space to" << metalLayer.colorspace;
+    }
 }
 
 /*
@@ -178,8 +195,10 @@
 - (void)drawRect:(NSRect)dirtyBoundingRect
 {
     Q_UNUSED(dirtyBoundingRect);
-    Q_ASSERT_X(!self.layer, "QNSView",
-        "The drawRect code path should not be hit when we are layer backed");
+    // As we are layer backed we shouldn't really end up here, but AppKit will
+    // in some cases call this method just because we implement it.
+    // FIXME: Remove drawRect and switch from displayLayer to updateLayer
+    qCWarning(lcQpaDrawing) << "[QNSView drawRect] called for layer backed view";
 }
 
 /*