summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-04-12 08:19:20 +0200
committerMichal Klocek <michal.klocek@qt.io>2022-05-05 10:02:29 +0200
commitd6512f48b86ccce1ce04784791576034acf641de (patch)
tree1ec39f8a16221dda8fd8a52c4fbfc33285e8fd9d
parent22c98aedbc75688200d07dd20ca43d9c48841894 (diff)
Enable Apple Silicon support
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ø <tor.arne.vestbo@qt.io>
-rw-r--r--configure.pri4
-rw-r--r--src/buildtools/config/support.pri4
2 files changed, 0 insertions, 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)
}