From 17b1c7e6b38e6d544d290089aff8288a23511738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 8 Jul 2020 13:36:53 +0200 Subject: macOS: Exclude 32-bit builds by checking pointer size Task-number: QTBUG-85279 Pick-to: 5.15 Pick-to: 5.12 Change-Id: I984ec21b9c5ed5e2bd02b3a8b52bbeb72953e454 Reviewed-by: Timur Pocheptsov --- src/plugins/platforms/cocoa/qcocoahelpers.h | 2 +- src/plugins/platforms/cocoa/qcocoahelpers.mm | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/plugins/platforms/cocoa') diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h index bb187c9fa7..1ef62e1323 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.h +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h @@ -193,7 +193,7 @@ constexpr backwards_t backwards(R&& r) { return {std::forward(r)}; } // ------------------------------------------------------------------------- -#if !defined(Q_PROCESSOR_X86_64) +#if QT_POINTER_SIZE == 4 #error "32-bit builds are not supported" #endif diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 6c21d1a374..cad5979e0f 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -370,10 +370,6 @@ QString qt_mac_removeAmpersandEscapes(QString s) // ------------------------------------------------------------------------- -#if !defined(Q_PROCESSOR_X86_64) -#error "32-bit builds are not supported" -#endif - QOperatingSystemVersion QMacVersion::buildSDK(VersionTarget target) { switch (target) { -- cgit v1.2.3