Last active
September 11, 2018 15:40
-
-
Save eitoball/9843d28f9944be05e02ef6ca2a5e28cd to your computer and use it in GitHub Desktop.
Homebrew qt@5.5 for XCode 9.4
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u a/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | |
--- a/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | |
+++ b/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | |
@@ -736,7 +736,7 @@ | |
QFixed QCoreTextFontEngine::emSquareSize() const | |
{ | |
- return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); | |
+ return QFixed(int(CTFontGetUnitsPerEm(ctfont))); | |
} | |
QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const | |
diff -u a/qtwebengine/src/3rdparty/chromium/net/cert/x509_certificate_mac.cc b/qtwebengine/src/3rdparty/chromium/net/cert/x509_certificate_mac.cc | |
--- a/qtwebengine/src/3rdparty/chromium/net/cert/x509_certificate_mac.cc | |
+++ b/qtwebengine/src/3rdparty/chromium/net/cert/x509_certificate_mac.cc | |
@@ -72,7 +72,7 @@ | |
void GetCertDateForOID(const x509_util::CSSMCachedCertificate& cached_cert, | |
const CSSM_OID* oid, | |
Time* result) { | |
- *result = Time::Time(); | |
+ *result = Time(); | |
x509_util::CSSMFieldValue field; | |
OSStatus status = cached_cert.GetField(oid, &field); | |
diff --git old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h | |
index bbb3793..74371d5 100644 | |
--- old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h | |
+++ new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.h | |
@@ -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 ®ion); | |
-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 | |
index cd73148..3f8429e 100644 | |
--- old/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm | |
+++ new/qtbase/src/plugins/platforms/cocoa/qcocoahelpers.mm | |
@@ -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) | |
{ | |
- // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev) | |
- OSStatus err = noErr; | |
- | |
- require_action(inContext != NULL, InvalidContext, err = paramErr); | |
- require_action(inBounds != NULL, InvalidBounds, err = paramErr); | |
- require_action(inImage != NULL, InvalidImage, err = paramErr); | |
- | |
CGContextSaveGState( inContext ); | |
CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds)); | |
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) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment