mirror of
https://github.com/bitcoin/bitcoin.git
synced 2024-11-20 02:25:40 +01:00
06cd0da21f
remove fix_configure_mac.patch Fixed upstream: https://bugreports.qt.io/browse/QTBUG-67286 remove fix_riscv64_arch.patch Was fixed upstream in 6a39e49a6cdeb28a04a3657bb6a22f848d5dfa9d remove fix_rcc_determinism.patch Fixed upstream in https://bugreports.qt.io/browse/QTBUG-62511 remove freetype_back_compat.patch By the time we ship a release with Qt 5.12, we'll certainly no-longer be supporting Ubuntu 14.04 and Ubuntu 16.04 ships with FreeType 2.6.1, which is new enough that using the symbol is no-longer an issue. The renaming of FT_Get_X11_Font_Format() happened in FreeType 2.6 remove xkb-default.patch This was removed upstream in d5abf545971da717014d316127045fc19edbcd65 Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
20 lines
516 B
Diff
20 lines
516 B
Diff
--- x/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
|
|
+++ y/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
|
|
@@ -52,6 +52,7 @@
|
|
//
|
|
|
|
#include <QtCore/qglobal.h>
|
|
+#include <qpa/qplatformprintdevice.h>
|
|
|
|
#ifndef QT_NO_PRINTER
|
|
|
|
--- x/qtbase/src/plugins/plugins.pro
|
|
+++ y/qtbase/src/plugins/plugins.pro
|
|
@@ -9,6 +9,3 @@ qtHaveModule(gui) {
|
|
!android:qtConfig(library): SUBDIRS *= generic
|
|
}
|
|
qtHaveModule(widgets): SUBDIRS += styles
|
|
-
|
|
-!winrt:qtHaveModule(printsupport): \
|
|
- SUBDIRS += printsupport
|