From 3fe33f5143db5c54a7905593c23c1ea4803e42df 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: [PATCH] macOS: Exclude 32-bit builds by checking pointer size Task-number: QTBUG-85279 Change-Id: I984ec21b9c5ed5e2bd02b3a8b52bbeb72953e454 Reviewed-by: Timur Pocheptsov (cherry picked from commit 17b1c7e6b38e6d544d290089aff8288a23511738) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/cocoa/qcocoahelpers.h | 2 +- src/plugins/platforms/cocoa/qcocoahelpers.mm | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h index 2aaff8c4ce9..456129ffec5 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.h +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h @@ -178,7 +178,7 @@ T qt_mac_resolveOption(const T &fallback, QWindow *window, const QByteArray &pro // ------------------------------------------------------------------------- -#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 d36a7f6d09b..240f184be47 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -372,10 +372,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) {