git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #103528 from veprbl/pr/qt515_darwin_fix

qt5{14,15}.qtbase: fix on darwin

commit8d455eb2c65e4528a03fa5baaf7bf0ff9fdf4711 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateTue 17 Nov 2020, 12:41 (6 years ago) parent2497a550c74da1
10 files changed+196−242
pkgs/development/libraries/qt-5/5.14/default.nix+4−1 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+1−3 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch−116 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patch+16 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patch+77 pkgs/development/libraries/qt-5/5.15/default.nix+4−1 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+1−3 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch−118 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patch+16 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patch+77
pkgs/development/libraries/qt-5/5.14/default.nix+4−1
@@ -54,7 +54,10 @@ let
5454 qtbase =
5555 optionals stdenv.isDarwin [
5656 ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
57− ./qtbase.patch.d/0002-qtbase-mac.patch
57+
58+ # Downgrade minimal required SDK to 10.12
59+ ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
60+ ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
5861
5962 # Patch framework detection to support X.framework/X.tbd,
6063 # extending the current support for X.framework/X.
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+1−3
@@ -309,10 +309,8 @@ index e3534561a5..3b01424e67 100644
309309-xcode_copy_phase_strip_setting.value = NO
310310-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
311311diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
312−deleted file mode 100644
313−index c40f58c987..0000000000
314312--- a/mkspecs/features/mac/sdk.mk
315−+++ /dev/null
313++++ b/mkspecs/features/mac/sdk.mk
316314@@ -1,25 +0,0 @@
317315-
318316-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patchdeleted−116
@@ -1,116 +0,0 @@
1−From ccaa916eab33093704293bc911eedd85fbe5f160 Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
3−Date: Fri, 3 Apr 2020 21:15:27 +0200
4−Subject: [PATCH 02/10] qtbase-mac
5−
6−---
7− src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
8− src/testlib/qappletestlogger.cpp | 2 +-
9− src/testlib/qappletestlogger_p.h | 2 +-
10− src/testlib/qtestcase.cpp | 2 +-
11− src/testlib/qtestlog.cpp | 2 +-
12− src/testlib/qtestlog_p.h | 2 +-
13− 6 files changed, 19 insertions(+), 7 deletions(-)
14−
15−diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
16−index 535d3579b2..3d70bf39c1 100644
17−--- a/src/corelib/kernel/qcore_mac_p.h
18−+++ b/src/corelib/kernel/qcore_mac_p.h
19−@@ -225,7 +225,7 @@ private:
20−
21− // --------------------------------------------------------------------------
22−
23−-#if !defined(QT_BOOTSTRAPPED)
24−+#if 0
25−
26− QT_END_NAMESPACE
27− #include <os/activity.h>
28−@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
29−
30− #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
31−
32−-#endif // !defined(QT_BOOTSTRAPPED)
33−+#else // !defined(QT_BOOTSTRAPPED)
34−+
35−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
36−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
37−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
38−+
39−+#define QT_APPLE_LOG_ACTIVITY2(...)
40−+#define QT_APPLE_LOG_ACTIVITY1(...)
41−+#define QT_APPLE_LOG_ACTIVITY(...)
42−+
43−+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
44−+
45−+#endif
46−
47− // -------------------------------------------------------------------------
48−
49−diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
50−index dfeadebdef..2a74330c1d 100644
51−--- a/src/testlib/qappletestlogger.cpp
52−+++ b/src/testlib/qappletestlogger.cpp
53−@@ -43,7 +43,7 @@
54−
55− QT_BEGIN_NAMESPACE
56−
57−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
58−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
59−
60− using namespace QTestPrivate;
61−
62−diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h
63−index 62c6d95c5a..f8e0a3b767 100644
64−--- a/src/testlib/qappletestlogger_p.h
65−+++ b/src/testlib/qappletestlogger_p.h
66−@@ -57,7 +57,7 @@
67−
68− QT_BEGIN_NAMESPACE
69−
70−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
71−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
72− class QAppleTestLogger : public QAbstractTestLogger
73− {
74− public:
75−diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
76−index 70733a692a..8bcda17858 100644
77−--- a/src/testlib/qtestcase.cpp
78−+++ b/src/testlib/qtestcase.cpp
79−@@ -852,7 +852,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
80−
81− bool addFallbackLogger = !explicitLoggerRequested;
82−
83−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
84−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
85− // Any explicitly requested loggers will be added by now, so we can check if they use stdout
86− const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout();
87− if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) {
88−diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
89−index f3ebf343c5..9b4f526b2e 100644
90−--- a/src/testlib/qtestlog.cpp
91−+++ b/src/testlib/qtestlog.cpp
92−@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
93− case QTestLog::TAP:
94− logger = new QTapTestLogger(filename);
95− break;
96−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
97−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
98− case QTestLog::Apple:
99− logger = new QAppleTestLogger;
100− break;
101−diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
102−index fff36f290d..f737ccf064 100644
103−--- a/src/testlib/qtestlog_p.h
104−+++ b/src/testlib/qtestlog_p.h
105−@@ -72,7 +72,7 @@ public:
106−
107− enum LogMode {
108− Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP
109−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
110−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
111− , Apple
112− #endif
113− #if defined(HAVE_XCTEST)
114−--
115−2.25.1
116−
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0013-define-kiosurfacesuccess.patchnew file+16
@@ -0,0 +1,16 @@
1+diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
2+index a367487e..c3aeca1d 100644
3+--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
4++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
5+@@ -49,6 +49,11 @@
6+ // but was only added in the 10.14 SDK, so declare it just in case.
7+ extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
8+
9++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html
10++#if !defined(kIOSurfaceSuccess)
11++#define kIOSurfaceSuccess KERN_SUCCESS
12++#endif
13++
14+ QT_BEGIN_NAMESPACE
15+
16+ Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/qtbase-sdk-10.12-mac.patchnew file+77
@@ -0,0 +1,77 @@
1+diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
2+--- a/mkspecs/common/macx.conf
3++++ b/mkspecs/common/macx.conf
4+@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64
5+
6+ # Should be 10.15, but as long as the CI builds with
7+ # older SDKs we have to keep this.
8+-QT_MAC_SDK_VERSION_MIN = 10.14
9++QT_MAC_SDK_VERSION_MIN = 10.12
10+
11+ QT_MAC_SDK_VERSION_MAX = 10.15
12+
13+diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm
14+--- a/src/corelib/kernel/qcore_mac_objc.mm
15++++ b/src/corelib/kernel/qcore_mac_objc.mm
16+@@ -142,16 +142,10 @@ QMacAutoReleasePool::QMacAutoReleasePool()
17+
18+ #ifdef QT_DEBUG
19+ void *poolFrame = nullptr;
20+- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
21+- void *frame;
22+- if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1))
23+- poolFrame = frame;
24+- } else {
25+ static const int maxFrames = 3;
26+ void *callstack[maxFrames];
27+ if (backtrace(callstack, maxFrames) == maxFrames)
28+ poolFrame = callstack[maxFrames - 1];
29+- }
30+
31+ if (poolFrame) {
32+ Dl_info info;
33+diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
34+--- a/src/gui/rhi/qrhi.cpp
35++++ b/src/gui/rhi/qrhi.cpp
36+@@ -4050,7 +4050,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh
37+ #endif
38+ case Metal:
39+ //#ifdef Q_OS_DARWIN
40+-#ifdef Q_OS_MACOS
41++#if 0
42+ r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params),
43+ static_cast<QRhiMetalNativeHandles *>(importDevice));
44+ break;
45+diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri
46+--- a/src/gui/rhi/rhi.pri
47++++ b/src/gui/rhi/rhi.pri
48+@@ -44,7 +44,7 @@ win32 {
49+ }
50+
51+ # darwin {
52+-macos {
53++false {
54+ HEADERS += \
55+ rhi/qrhimetal_p.h \
56+ rhi/qrhimetal_p_p.h
57+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
58+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
59++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
60+@@ -134,7 +134,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
61+ NSImage *nsimage = qt_mac_create_nsimage(pm);
62+ [nsimage setSize:NSSizeFromCGSize(pmDeviceIndependentSize.toCGSize())];
63+
64+- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
65++ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND);
66+ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
67+ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
68+
69+@@ -145,7 +145,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
70+ CGFloat flippedY = pmDeviceIndependentSize.height() - hotSpot.y();
71+ event_location.y -= flippedY;
72+ NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0);
73+- NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
74++ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
75+
76+ [theWindow dragImage:nsimage
77+ at:event_location
pkgs/development/libraries/qt-5/5.15/default.nix+4−1
@@ -54,7 +54,10 @@ let
5454 qtbase =
5555 optionals stdenv.isDarwin [
5656 ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
57− ./qtbase.patch.d/0002-qtbase-mac.patch
57+
58+ # Downgrade minimal required SDK to 10.12
59+ ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
60+ ./qtbase.patch.d/qtbase-sdk-10.12-mac.patch
5861
5962 # Patch framework detection to support X.framework/X.tbd,
6063 # extending the current support for X.framework/X.
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+1−3
@@ -309,10 +309,8 @@ index e3534561a5..3b01424e67 100644
309309-xcode_copy_phase_strip_setting.value = NO
310310-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
311311diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
312−deleted file mode 100644
313−index c40f58c987..0000000000
314312--- a/mkspecs/features/mac/sdk.mk
315−+++ /dev/null
313++++ b/mkspecs/features/mac/sdk.mk
316314@@ -1,25 +0,0 @@
317315-
318316-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patchdeleted−118
@@ -1,118 +0,0 @@
1−From a9ba67d3db7390d9ddc46751346e70b0a522711a Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
3−Date: Fri, 3 Apr 2020 21:15:27 +0200
4−Subject: [PATCH 02/11] qtbase-mac
5−
6−---
7− src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
8− src/testlib/qappletestlogger.cpp | 2 +-
9− src/testlib/qappletestlogger_p.h | 2 +-
10− src/testlib/qtestcase.cpp | 2 +-
11− src/testlib/qtestlog.cpp | 2 +-
12− src/testlib/qtestlog_p.h | 4 ++--
13− 6 files changed, 20 insertions(+), 8 deletions(-)
14−
15−diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
16−index 535d3579b2..3d70bf39c1 100644
17−--- a/src/corelib/kernel/qcore_mac_p.h
18−+++ b/src/corelib/kernel/qcore_mac_p.h
19−@@ -225,7 +225,7 @@ private:
20−
21− // --------------------------------------------------------------------------
22−
23−-#if !defined(QT_BOOTSTRAPPED)
24−+#if 0
25−
26− QT_END_NAMESPACE
27− #include <os/activity.h>
28−@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
29−
30− #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
31−
32−-#endif // !defined(QT_BOOTSTRAPPED)
33−+#else // !defined(QT_BOOTSTRAPPED)
34−+
35−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...)
36−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...)
37−+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...)
38−+
39−+#define QT_APPLE_LOG_ACTIVITY2(...)
40−+#define QT_APPLE_LOG_ACTIVITY1(...)
41−+#define QT_APPLE_LOG_ACTIVITY(...)
42−+
43−+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...)
44−+
45−+#endif
46−
47− // -------------------------------------------------------------------------
48−
49−diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
50−index dfeadebdef..2a74330c1d 100644
51−--- a/src/testlib/qappletestlogger.cpp
52−+++ b/src/testlib/qappletestlogger.cpp
53−@@ -43,7 +43,7 @@
54−
55− QT_BEGIN_NAMESPACE
56−
57−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
58−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
59−
60− using namespace QTestPrivate;
61−
62−diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h
63−index 62c6d95c5a..f8e0a3b767 100644
64−--- a/src/testlib/qappletestlogger_p.h
65−+++ b/src/testlib/qappletestlogger_p.h
66−@@ -57,7 +57,7 @@
67−
68− QT_BEGIN_NAMESPACE
69−
70−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
71−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
72− class QAppleTestLogger : public QAbstractTestLogger
73− {
74− public:
75−diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
76−index f45999c7fa..d5b525dc12 100644
77−--- a/src/testlib/qtestcase.cpp
78−+++ b/src/testlib/qtestcase.cpp
79−@@ -849,7 +849,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool
80−
81− bool addFallbackLogger = !explicitLoggerRequested;
82−
83−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
84−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
85− // Any explicitly requested loggers will be added by now, so we can check if they use stdout
86− const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout();
87− if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) {
88−diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
89−index a388780532..63ab965101 100644
90−--- a/src/testlib/qtestlog.cpp
91−+++ b/src/testlib/qtestlog.cpp
92−@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename)
93− case QTestLog::TAP:
94− logger = new QTapTestLogger(filename);
95− break;
96−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
97−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
98− case QTestLog::Apple:
99− logger = new QAppleTestLogger;
100− break;
101−diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
102−index ddaf14ed9b..0c49c93a88 100644
103−--- a/src/testlib/qtestlog_p.h
104−+++ b/src/testlib/qtestlog_p.h
105−@@ -74,8 +74,8 @@ public:
106− Q_DISABLE_COPY_MOVE(QTestLog)
107−
108− enum LogMode {
109−- Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP
110−-#if defined(QT_USE_APPLE_UNIFIED_LOGGING)
111−+ Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP
112−+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0
113− , Apple
114− #endif
115− #if defined(HAVE_XCTEST)
116−--
117−2.25.4
118−
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0013-define-kiosurfacesuccess.patchnew file+16
@@ -0,0 +1,16 @@
1+diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
2+index a367487e..c3aeca1d 100644
3+--- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
4++++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm
5+@@ -49,6 +49,11 @@
6+ // but was only added in the 10.14 SDK, so declare it just in case.
7+ extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);
8+
9++// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html
10++#if !defined(kIOSurfaceSuccess)
11++#define kIOSurfaceSuccess KERN_SUCCESS
12++#endif
13++
14+ QT_BEGIN_NAMESPACE
15+
16+ Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/qtbase-sdk-10.12-mac.patchnew file+77
@@ -0,0 +1,77 @@
1+diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf
2+--- a/mkspecs/common/macx.conf
3++++ b/mkspecs/common/macx.conf
4+@@ -10,7 +10,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64
5+
6+ # Should be 10.15, but as long as the CI builds with
7+ # older SDKs we have to keep this.
8+-QT_MAC_SDK_VERSION_MIN = 10.14
9++QT_MAC_SDK_VERSION_MIN = 10.12
10+
11+ QT_MAC_SDK_VERSION_MAX = 10.15
12+
13+diff --git a/src/corelib/kernel/qcore_mac.mm b/src/corelib/kernel/qcore_mac.mm
14+--- a/src/corelib/kernel/qcore_mac.mm
15++++ b/src/corelib/kernel/qcore_mac.mm
16+@@ -261,16 +261,10 @@ QMacAutoReleasePool::QMacAutoReleasePool()
17+
18+ #ifdef QT_DEBUG
19+ void *poolFrame = nullptr;
20+- if (__builtin_available(macOS 10.14, iOS 12.0, tvOS 12.0, watchOS 5.0, *)) {
21+- void *frame;
22+- if (backtrace_from_fp(__builtin_frame_address(0), &frame, 1))
23+- poolFrame = frame;
24+- } else {
25+ static const int maxFrames = 3;
26+ void *callstack[maxFrames];
27+ if (backtrace(callstack, maxFrames) == maxFrames)
28+ poolFrame = callstack[maxFrames - 1];
29+- }
30+
31+ if (poolFrame) {
32+ Dl_info info;
33+diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp
34+--- a/src/gui/rhi/qrhi.cpp
35++++ b/src/gui/rhi/qrhi.cpp
36+@@ -4251,7 +4251,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh
37+ break;
38+ #endif
39+ case Metal:
40+-#if defined(Q_OS_MACOS) || defined(Q_OS_IOS)
41++#if 0
42+ r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params),
43+ static_cast<QRhiMetalNativeHandles *>(importDevice));
44+ break;
45+diff --git a/src/gui/rhi/rhi.pri b/src/gui/rhi/rhi.pri
46+--- a/src/gui/rhi/rhi.pri
47++++ b/src/gui/rhi/rhi.pri
48+@@ -43,7 +43,7 @@ win32 {
49+ LIBS += -ld3d11 -ldxgi -ldxguid
50+ }
51+
52+-macos|ios {
53++false {
54+ HEADERS += \
55+ rhi/qrhimetal_p.h \
56+ rhi/qrhimetal_p_p.h
57+diff --git a/src/plugins/platforms/cocoa/qcocoadrag.mm b/src/plugins/platforms/cocoa/qcocoadrag.mm
58+--- a/src/plugins/platforms/cocoa/qcocoadrag.mm
59++++ b/src/plugins/platforms/cocoa/qcocoadrag.mm
60+@@ -133,7 +133,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
61+ NSImage *dragImage = [NSImage imageFromQImage:pm.toImage()];
62+ Q_ASSERT(dragImage);
63+
64+- QMacPasteboard dragBoard(CFStringRef(NSPasteboardNameDrag), QMacInternalPasteboardMime::MIME_DND);
65++ QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacInternalPasteboardMime::MIME_DND);
66+ m_drag->mimeData()->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray("dummy"));
67+ dragBoard.setMimeData(m_drag->mimeData(), QMacPasteboard::LazyRequest);
68+
69+@@ -144,7 +144,7 @@ Qt::DropAction QCocoaDrag::drag(QDrag *o)
70+ CGFloat flippedY = dragImage.size.height - hotSpot.y();
71+ event_location.y -= flippedY;
72+ NSSize mouseOffset_unused = NSMakeSize(0.0, 0.0);
73+- NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSPasteboardNameDrag];
74++ NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard];
75+
76+ [theWindow dragImage:dragImage
77+ at:event_location