Skip to content

Commit

Permalink
up
Browse files Browse the repository at this point in the history
  • Loading branch information
bobpepers committed Feb 12, 2019
1 parent e1c2023 commit 56b1915
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 12 deletions.
12 changes: 6 additions & 6 deletions depends/patches/qt/fix-cocoahelpers-macos.patch
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ index bbb3793..74371d5 100644
@@ -80,7 +80,7 @@ QColor qt_mac_toQColor(CGColorRef color);
// Creates a mutable shape, it's the caller's responsibility to release.
HIMutableShapeRef qt_mac_QRegionToHIMutableShape(const QRegion &region);

-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);
+void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage);

NSDragOperation qt_mac_mapDropAction(Qt::DropAction action);
NSDragOperation qt_mac_mapDropActions(Qt::DropActions actions);
diff --git old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm
Expand All @@ -41,7 +41,7 @@ index cd73148..3f8429e 100644
@@ -544,15 +544,8 @@ NSRect qt_mac_flipRect(const QRect &rect)
return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height());
}

-OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
+void qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGImageRef inImage)
{
Expand All @@ -57,14 +57,14 @@ index cd73148..3f8429e 100644
CGContextScaleCTM(inContext, 1, -1);
@@ -560,10 +553,6 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
CGContextDrawImage(inContext, *inBounds, inImage);

CGContextRestoreGState(inContext);
-InvalidImage:
-InvalidBounds:
-InvalidContext:
- return err;
}

Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum)
--
2.7.4
2.7.4
8 changes: 5 additions & 3 deletions depends/patches/qt/fix_configure_mac.patch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
sdk = $$2
isEmpty(sdk): \
sdk = $$QMAKE_MAC_SDK

isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
+ QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
Expand All @@ -31,7 +31,7 @@
--- old/qtbase/configure 2018-02-08 10:24:48.000000000 -0800
+++ new/qtbase/configure 2018-03-23 05:42:29.000000000 -0700
@@ -232,8 +232,13 @@

sdk=$(getSingleQMakeVariable "QMAKE_MAC_SDK" "$1")
if [ -z "$sdk" ]; then echo "QMAKE_MAC_SDK must be set when building on Mac" >&2; exit 1; fi
- sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
Expand All @@ -43,6 +43,8 @@
+ sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
+ if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
+ fi

case "$sdk" in
macosx*)


2 changes: 1 addition & 1 deletion depends/patches/qt/fix_no_printer.patch
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
}
-
-!winrt:qtHaveModule(printsupport): \
- SUBDIRS += printsupport
- SUBDIRS += printsupport
2 changes: 1 addition & 1 deletion depends/patches/qt/fix_rcc_determinism.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
+ lib.writeNumber8(lastmod);
if (text || pass1)
lib.writeChar('\n');
}
}
2 changes: 1 addition & 1 deletion depends/patches/qt/xkb-default.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
+ return(true)
}

defineTest(qtConfTest_qpaDefaultPlatform) {
defineTest(qtConfTest_qpaDefaultPlatform) {
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ index 99e889d..e69038e 100644
#if !defined __MINGW32__
--
2.7.4

Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ index 4fc59c3e..c3fdfd46 100644
#endif
--
2.11.1

0 comments on commit 56b1915

Please sign in to comment.