diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-08 13:36:53 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-08 19:18:05 +0200 |
| commit | 17b1c7e6b38e6d544d290089aff8288a23511738 (patch) | |
| tree | a1ab84dbb6ec6a1f3237d833f4c6700f4ba2b329 /src | |
| parent | b10f8ba3506c6c8c941826aee0225192aa4cd1af (diff) | |
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 <timur.pocheptsov@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.mm | 4 |
2 files changed, 1 insertions, 5 deletions
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<R> backwards(R&& r) { return {std::forward<R>(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) { |