File tree Expand file tree Collapse file tree 2 files changed +23
-0
lines changed Expand file tree Collapse file tree 2 files changed +23
-0
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,7 @@ $(package)_patches += support_new_android_ndks.patch fix_android_jni_static.patc
13
13
$(package)_patches+ = no_sdk_version_check.patch
14
14
$(package)_patches+ = fix_lib_paths.patch fix_android_pch.patch
15
15
$(package)_patches+ = qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
16
+ $(package)_patches+ = fix_montery_include.patch
16
17
17
18
$(package)_qttranslations_file_name =qttranslations-$($(package ) _suffix)
18
19
$(package)_qttranslations_sha256_hash =577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3
@@ -232,6 +233,7 @@ define $(package)_preprocess_cmds
232
233
patch -p1 -i $($(package ) _patch_dir) /fix_lib_paths.patch && \
233
234
patch -p1 -i $($(package ) _patch_dir) /qtbase-moc-ignore-gcc-macro.patch && \
234
235
patch -p1 -i $($(package ) _patch_dir) /fix_limits_header.patch && \
236
+ patch -p1 -i $($(package ) _patch_dir) /fix_montery_include.patch && \
235
237
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
236
238
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
237
239
cp -f $($(package ) _patch_dir) /mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
Original file line number Diff line number Diff line change
1
+ From dece6f5840463ae2ddf927d65eb1b3680e34a547
2
+ From: Øystein Heskestad <
[email protected] >
3
+ Date: Wed, 27 Oct 2021 13:07:46 +0200
4
+ Subject: [PATCH] Add missing macOS header file that was indirectly included before
5
+
6
+ See: https://bugreports.qt.io/browse/QTBUG-97855
7
+
8
+ Upstream Commits:
9
+ - Qt 6.2: c884bf138a21dd7320e35cef34d24e22e74d7ce0
10
+
11
+ diff --git a/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h b/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
12
+ index e070ba97..07c75b04 100644
13
+ --- a/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
14
+ +++ b/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h
15
+ @@ -40,6 +40,7 @@
16
+ #ifndef QIOSURFACEGRAPHICSBUFFER_H
17
+ #define QIOSURFACEGRAPHICSBUFFER_H
18
+
19
+ + #include <CoreGraphics/CGColorSpace.h>
20
+ #include <qpa/qplatformgraphicsbuffer.h>
21
+ #include <private/qcore_mac_p.h>
You can’t perform that action at this time.
0 commit comments