diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-12-15 14:54:48 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-12-16 03:46:42 +0100 |
| commit | 1c9785bf7eee038f6f0b8e2d73dcb9588f6d60c1 (patch) | |
| tree | df25d3e78c72d75c62e162e58c12c6e53e54b38f | |
| parent | 5e30e3a7cb658aaa8aae5996892b4acd4282034d (diff) | |
Skip QtWebEngine and QtPdf if building for Apple Silicon
Change-Id: I0971900ab654e7426359204d6bddbc61c38143e9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | configure.pri | 4 | ||||
| -rw-r--r-- | src/buildtools/config/support.pri | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/configure.pri b/configure.pri index e072961f0..a7a743144 100644 --- a/configure.pri +++ b/configure.pri @@ -140,6 +140,10 @@ defineTest(qtConfTest_detectPlatform) { } defineTest(qtConfTest_detectArch) { + macos { + qtLog("Apple Silicon not supported yet.") + contains(QT_ARCHS, "arm64"): 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 e7f869a15..7a07b1b5b 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -110,6 +110,10 @@ 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) } |