From d6512f48b86ccce1ce04784791576034acf641de Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 12 Apr 2022 08:19:20 +0200 Subject: Enable Apple Silicon support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reverts "Don't unconditionally log that Apple Silicon is not supported" This reverts commit 3387ca53e550c1a63ed32ddf4f1dc48e61e9fa62. Revert "Skip QtWebEngine and QtPdf if building for Apple Silicon" This reverts commit 1c9785bf7eee038f6f0b8e2d73dcb9588f6d60c1. [ChangeLog] Apple Silicon universal- and cross-builds on macOS are now supported. Change-Id: I01973e3a29def4cd001b5dcb6354d23dbfe15dcd Reviewed-by: Tor Arne Vestbø --- configure.pri | 4 ---- src/buildtools/config/support.pri | 4 ---- 2 files changed, 8 deletions(-) diff --git a/configure.pri b/configure.pri index 8705ad93f..e072961f0 100644 --- a/configure.pri +++ b/configure.pri @@ -140,10 +140,6 @@ defineTest(qtConfTest_detectPlatform) { } defineTest(qtConfTest_detectArch) { - macos:contains(QT_ARCHS, "arm64") { - qtLog("Apple Silicon not supported yet.") - return(false) - } contains(QT_ARCH, "i386")|contains(QT_ARCH, "x86_64"): return(true) contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true) contains(QT_ARCH, "mips"): return(true) diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 7a07b1b5b..e7f869a15 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -110,10 +110,6 @@ defineTest(qtwebengine_checkForPlatform) { defineTest(qtwebengine_checkForArch) { module = $$1 !qtConfig(webengine-arch-support) { - macos:contains(QT_ARCHS, "arm64") { - qtwebengine_skipBuild("$${module} can not be built for Apple Silicon yet.") - return(false) - } qtwebengine_skipBuild("$${module} can only be built for x86, x86-64, ARM, Aarch64, and MIPSel architectures.") return(false) } -- cgit v1.2.3