diff options
author | fanquake <fanquake@gmail.com> | 2021-06-02 12:12:07 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2021-06-02 12:12:33 +0800 |
commit | a83bbf02c76235faf6c2759bba03dc6fd9e00bc7 (patch) | |
tree | 1e65b1f4971b4ac6304d8b7b0585b81b207eb063 /depends/patches/qt/fix_bigsur_drawing.patch | |
parent | 0a3b8ea11ad2f2b06623c3ded9d444ced332f823 (diff) | |
parent | fa416cea84d8f1528fc7ecf9a04654aae75ac3f5 (diff) | |
download | bitcoin-a83bbf02c76235faf6c2759bba03dc6fd9e00bc7.tar.xz |
Merge bitcoin/bitcoin#22054: depends: Bump Qt version to 5.12.11
fa416cea84d8f1528fc7ecf9a04654aae75ac3f5 depends: Bump Qt version to 5.12.11 (Hennadii Stepanov)
Pull request description:
Qt 5.12.11:
- [fixes](https://github.com/qt/qtbase/commit/c5d904639dbd690a36306e2b455610029704d821) macOS related [QTBUG-87014](https://bugreports.qt.io/browse/QTBUG-87014), and the `fix_bigsur_drawing.patch` (which is our workaround for QTBUG-87014) could be dropped
- [upgrades](https://github.com/qt/qtbase/commit/00326c9dc1ec6c80679347859c2fe01d4837b061) supported macOS SDK to 11.0, and removes related warnings
- fixes tab widget rendering on macOS Big Sur ([here](https://github.com/qt/qtbase/commit/4d6832d03f31b513ff2e3517197691bedddaccdf) and [here](https://github.com/qt/qtbase/commit/28b015342d000b8487c853153f1d93606d3c2add)):
- master (5.12.10)
![DeepinScreenshot_select-area_20210525122725](https://user-images.githubusercontent.com/32963518/119474470-dd24a180-bd54-11eb-82e6-ca4d39b0b177.png)
![DeepinScreenshot_select-area_20210525123634](https://user-images.githubusercontent.com/32963518/119475548-ebbf8880-bd55-11eb-9c13-477016f8c23b.png)
- this PR (5.12.11)
![Screenshot from 2021-05-25 12-28-02](https://user-images.githubusercontent.com/32963518/119474537-ed3c8100-bd54-11eb-8efe-7fe5ccae8a98.png)
Closes https://github.com/bitcoin-core/gui/issues/136.
ACKs for top commit:
goums:
ACK fa416cea84d8f1528fc7ecf9a04654aae75ac3f5
fanquake:
ACK fa416cea84d8f1528fc7ecf9a04654aae75ac3f5 - merging this now to move it out of the way of other Qt related changes.
Tree-SHA512: 4e621b214f05d12a060757fadf2fa103c09b594d7b1c2ad9200f550e55c1e1fdf66f2f830550e724b9277448e5480be256cb0003f4597902944400e16c4a68b8
Diffstat (limited to 'depends/patches/qt/fix_bigsur_drawing.patch')
-rw-r--r-- | depends/patches/qt/fix_bigsur_drawing.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/depends/patches/qt/fix_bigsur_drawing.patch b/depends/patches/qt/fix_bigsur_drawing.patch deleted file mode 100644 index 98c0c6be30..0000000000 --- a/depends/patches/qt/fix_bigsur_drawing.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix GUI stuck on Big Sur - -See: - - https://github.com/bitcoin-core/gui/issues/249 - - https://github.com/bitcoin/bitcoin/pull/21495 - - https://bugreports.qt.io/browse/QTBUG-87014 - -We should be able to drop this once we are using one of the following versions: - - Qt 5.12.11 or later, see upstream commit: c5d904639dbd690a36306e2b455610029704d821 - - Qt 5.15.3 or later, see upstream commit: 2cae34354bd41ae286258c7a6b3653b746e786ae - ---- a/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm -+++ b/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm -@@ -95,8 +95,15 @@ - // by AppKit at a point where we've already set up other parts of the platform plugin - // based on the presence of layers or not. Once we've rewritten these parts to support - // dynamically picking up layer enablement we can let AppKit do its thing. -- return QMacVersion::buildSDK() >= QOperatingSystemVersion::MacOSMojave -- && QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSMojave; -+ -+ if (QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSBigSur) -+ return true; // Big Sur always enables layer-backing, regardless of SDK -+ -+ if (QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSMojave -+ && QMacVersion::buildSDK() >= QOperatingSystemVersion::MacOSMojave) -+ return true; // Mojave and Catalina enable layers based on the app's SDK -+ -+ return false; // Prior versions needed explicitly enabled layer backing - } - - - (BOOL)layerExplicitlyRequested |