Skip to content

Instantly share code, notes, and snippets.

@zv1n
Created April 13, 2017 18:55
Show Gist options
  • Select an option

  • Save zv1n/5e1f19bcf5bd5d502d5737ce2a03ba05 to your computer and use it in GitHub Desktop.

Select an option

Save zv1n/5e1f19bcf5bd5d502d5737ce2a03ba05 to your computer and use it in GitHub Desktop.
Exports patch for Qt 4.8.6 and SurroundSCM
--- a/./src/gui/kernel/qcocoaapplication_mac_p.h 2014-04-10 13:37:12.000000000 -0500
+++ b/./src/gui/kernel/qcocoaapplication_mac_p.h 2017-04-13 12:46:59.000000000 -0500
@@ -104,6 +104,7 @@
- (BOOL)QT_MANGLE_NAMESPACE(qt_filterEvent):(NSEvent *)event;
@end
+Q_GUI_EXPORT
@interface QT_MANGLE_NAMESPACE(QNSApplication) : NSApplication {
}
@end
--- a/./src/gui/kernel/qcocoawindow_mac_p.h 2014-04-10 13:37:12.000000000 -0500
+++ b/./src/gui/kernel/qcocoawindow_mac_p.h 2017-04-12 10:31:06.000000000 -0500
@@ -81,6 +81,8 @@
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
@end
+
+Q_GUI_EXPORT
@interface QT_MANGLE_NAMESPACE(QCocoaWindow) : NSWindow {
QStringList *currentCustomDragTypes;
QCocoaDropData *dropData;
--- a/./src/gui/painting/qpaintengine_mac.cpp 2014-04-10 13:37:12.000000000 -0500
+++ b/./src/gui/painting/qpaintengine_mac.cpp 2017-04-12 01:25:07.000000000 -0500
@@ -340,13 +340,7 @@
}
// 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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment