From 3c3f6ebdbb48c9c071ef1a34a955b36bdaed4f99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 12 Jul 2021 16:34:21 +0200 Subject: [PATCH] macOS: Map QSurfaceFormat color space to NSWindow via ICC data Instead of special casing sRGB. Pick-to: 6.2 6.1 Change-Id: I7ad20c4b9600210333d5e44c3a2d20ce7d39dd92 Reviewed-by: Allan Sandfeld Jensen --- src/plugins/platforms/cocoa/qcocoawindow.mm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index 9362351595..ee1689c2f4 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -1668,8 +1668,11 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel) applyContentBorderThickness(nsWindow); - if (format().colorSpace() == QColorSpace::SRgb) - nsWindow.colorSpace = NSColorSpace.sRGBColorSpace; + if (QColorSpace colorSpace = format().colorSpace(); colorSpace.isValid()) { + NSData *iccData = colorSpace.iccProfile().toNSData(); + nsWindow.colorSpace = [[[NSColorSpace alloc] initWithICCProfileData:iccData] autorelease]; + qCDebug(lcQpaDrawing) << "Set" << this << "color space to" << nsWindow.colorSpace; + } return nsWindow; }