forked from bitcoin/bitcoin
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'bitcoin/0.16'
- Loading branch information
Showing
123 changed files
with
10,617 additions
and
6,134 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 82bcf405f6db1d55b684a1f63a4aabad376cdad7 | ||
| 11049f4fe62606d1b0380a9ef800ac130f0fbadf |
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| From 0707260a4f8e64dfadf1df5f935e74cabb7c7d27 Mon Sep 17 00:00:00 2001 | ||
| From: Jake Petroules <jake.petroules@qt.io> | ||
| Date: Sun, 1 Oct 2017 21:48:17 -0700 | ||
| Subject: [PATCH] Fix build error with macOS 10.13 SDK | ||
| MIME-Version: 1.0 | ||
| Content-Type: text/plain; charset=utf8 | ||
| Content-Transfer-Encoding: 8bit | ||
|
|
||
| Several of these variables/macros are no longer defined. We didn't | ||
| validate the preconditions on iOS, tvOS, or watchOS, so no | ||
| need to bother validating them on macOS either. Nor did we check the | ||
| OSStatus result on any platform anyways. | ||
|
|
||
| Task-number: QTBUG-63401 | ||
| Change-Id: Ife64dff767cf6d3f4b839fc53ec486181c176bf3 | ||
| (cherry-picked from 861544583511d4e6f7745d2339b26ff1cd44132b) | ||
| Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> | ||
| Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> | ||
| --- | ||
| src/plugins/platforms/cocoa/qcocoahelpers.h | 2 +- | ||
| src/plugins/platforms/cocoa/qcocoahelpers.mm | 13 +------------ | ||
| 2 files changed, 2 insertions(+), 13 deletions(-) | ||
|
|
||
| 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) | ||
| -- | ||
| 2.7.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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 Mon Sep 17 00:00:00 2001 | ||
| From: Gabriel de Dietrich <gabriel.dedietrich@qt.io> | ||
| Date: Fri, 30 Mar 2018 11:58:16 -0700 | ||
| Subject: [PATCH] QCoreTextFontEngine: Fix build with Xcode 9.3 | ||
|
|
||
| Apple LLVM version 9.1.0 (clang-902.0.39.1) | ||
|
|
||
| Error message: | ||
|
|
||
| .../qfontengine_coretext.mm:827:20: error: qualified reference to | ||
| 'QFixed' is a constructor name rather than a type in this context | ||
| return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); | ||
|
|
||
| Change-Id: Iebe26b3b087a16b10664208fc8851cbddb47f043 | ||
| Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> | ||
| --- | ||
| src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | ||
| index 25ff69d877d..98b753eff96 100644 | ||
| --- old/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | ||
| +++ new/qtbase/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm | ||
| @@ -824,7 +824,7 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gl | ||
|
|
||
| QFixed QCoreTextFontEngine::emSquareSize() const | ||
| { | ||
| - return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); | ||
| + return QFixed(int(CTFontGetUnitsPerEm(ctfont))); | ||
| } | ||
|
|
||
| QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const | ||
| -- | ||
| 2.16.3 |
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
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
Oops, something went wrong.