1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: Exclude 32-bit builds by checking pointer size

Browse Source 
Task-number: QTBUG-85279
Change-Id: I984ec21b9c5ed5e2bd02b3a8b52bbeb72953e454
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 17b1c7e6b38e6d544d290089aff8288a23511738)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2020-07-08 13:36:53 +02:00 committed by Qt Cherry-pick Bot
parent 1184b79381
commit 3fe33f5143
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/cocoa/qcocoahelpers.h
View File

@ -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

4
src/plugins/platforms/cocoa/qcocoahelpers.mm
View File

@ -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) {