32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
|
From 27aa46933bb32a88c310fe5918a49a3f34d65dfe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mike McQuaid <mike@mikemcquaid.com>
|
||
|
|
Date: Sun, 13 Sep 2015 11:55:59 +0100
|
||
|
|
Subject: [PATCH] Fix El Capitan build.
|
||
|
|
|
||
|
|
---
|
||
|
|
src/gui/painting/qpaintengine_mac.cpp | 8 +-------
|
||
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/gui/painting/qpaintengine_mac.cpp b/src/gui/painting/qpaintengine_mac.cpp
|
||
|
|
index 4aa0668..63b646d 100644
|
||
|
|
--- a/src/gui/painting/qpaintengine_mac.cpp
|
||
|
|
+++ b/src/gui/painting/qpaintengine_mac.cpp
|
||
|
|
@@ -340,13 +340,7 @@ CGColorSpaceRef QCoreGraphicsPaintEngine::macDisplayColorSpace(const QWidget *wi
|
||
|
|
}
|
||
|
|
|
||
|
|
// Get the color space from the display profile.
|
||
|
|
- CGColorSpaceRef colorSpace = 0;
|
||
|
|
- CMProfileRef displayProfile = 0;
|
||
|
|
- CMError err = CMGetProfileByAVID((CMDisplayIDType)displayID, &displayProfile);
|
||
|
|
- if (err == noErr) {
|
||
|
|
- colorSpace = CGColorSpaceCreateWithPlatformColorSpace(displayProfile);
|
||
|
|
- CMCloseProfile(displayProfile);
|
||
|
|
- }
|
||
|
|
+ CGColorSpaceRef colorSpace = CGDisplayCopyColorSpace(displayID);
|
||
|
|
|
||
|
|
// Fallback: use generic DeviceRGB
|
||
|
|
if (colorSpace == 0)
|
||
|
|
--
|
||
|
|
2.3.8 (Apple Git-58)
|
||
|
|
|