From 264ab44531bd7953b30d8de481d39d0ccbb78e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 3 Nov 2021 14:49:18 +0100 Subject: macOS: Bump max supported SDK version to 12 Change-Id: Ib4980719fe372abfb2566fe4e82db29226a7fcfa Reviewed-by: Timur Pocheptsov (cherry picked from commit 63feecfc11640d66b6b0c663f97ffcc0abfb6181) Reviewed-by: Qt Cherry-pick Bot --- mkspecs/common/macx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/common/macx.conf') diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 61a1300860..571aa84c63 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -12,7 +12,7 @@ QMAKE_APPLE_DEVICE_ARCHS = x86_64 # older SDKs we have to keep this. QT_MAC_SDK_VERSION_MIN = 10.14 -QT_MAC_SDK_VERSION_MAX = 11.0 +QT_MAC_SDK_VERSION_MAX = 12 device.sdk = macosx device.target = device -- cgit v1.2.3 From 8bb90ab760310c9bc82b6ecbe068532fcb4e7822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 4 Dec 2020 17:29:06 +0100 Subject: macOS: Don't hard-code x86_64 as the architecture when using qmake The qmake variable QMAKE_APPLE_DEVICE_ARCHS was added for iOS, to support universal builds, as the QT_ARCH is a single value. Since the qmake macOS builds are non-universal (at the moment), we remove the hard-coded value for QMAKE_APPLE_DEVICE_ARCHS on macOS, and let the normal architecture test resolve the arch, like on other platforms. To ensure that the following configuration tests are run with an -arch argument, we trigger a commit of the preliminary Qt configuration after running the architecture test. This is not strictly necessary, but makes it clearer what's going on during configure. The device_and_simulator configuration option was used by the iOS toolchain, and needed to be moved up in the configuration test order to not break later tests. The logic in mac/default_post.prf for both Xcode and Makefiles to add -arch flags was kept as is, based on the existing variable, to avoid too many changes to this logic. The logic in toolchain.prf was amended to make it clear and ensure that it only applies to iOS builds. macOS builds do not have this issue. Change-Id: I70db7e4c27f0d3da5d0af33cb491d72c312d3fa8 Reviewed-by: Alexandru Croitor (cherry picked from commit 9082cc8e8d5a6441dabe5e7a95bc0cd9085b95fe) --- mkspecs/common/macx.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'mkspecs/common/macx.conf') diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 571aa84c63..006003d465 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -6,7 +6,6 @@ QMAKE_PLATFORM += macos osx macx QMAKE_MAC_SDK = macosx QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 -QMAKE_APPLE_DEVICE_ARCHS = x86_64 # Should be 10.15, but as long as the CI builds with # older SDKs we have to keep this. -- cgit v1.2.3 From a1c3e0b67cac240d39e101b8397460a3c3886e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 21 Jun 2021 21:48:25 +0200 Subject: macOS: Respect QMAKE_APPLE_DEVICE_ARCHS by building for all those archs If QMAKE_APPLE_DEVICE_ARCHS is not set, we pick up the available archs based on what Qt was built with (QT_ARCS), but only build the active arch. Change-Id: I83273f878022af34a3a0d0eeae8b11d781f78c49 Reviewed-by: Alexandru Croitor (cherry picked from commit b0a9825edb490de9e2af09bb91fb6f1819fd7616) --- mkspecs/common/macx.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mkspecs/common/macx.conf') diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 006003d465..2d4ca24e96 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -19,6 +19,8 @@ device.dir_affix = $${device.sdk} device.CONFIG = $${device.sdk} device.deployment_identifier = $${device.sdk} +CONFIG += only_active_arch + QMAKE_LIBS_VULKAN = include(mac.conf) -- cgit v1.2.3