From f6777af17d5d8caf31f0d4704ea49a95ce724f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 16 Apr 2024 10:46:03 +0000 Subject: [PATCH] Revert "CMake: Improve Xcode projects for single SDK builds on Apple platforms" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5898e0e4f14d1e6d0b0fc09e122346d817cb821a. Likely broke a CMake deployment test in qtdeclarative. Change-Id: I90c8343f0657845dd514e573b7333f441b70cc9e Reviewed-by: Tor Arne Vestbø --- src/corelib/Qt6CoreMacros.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 96e75fc3c0c..d3203c5cd9f 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -3474,17 +3474,6 @@ macro(qt6_standard_project_setup) if(NOT DEFINED QT_I18N_SOURCE_LANGUAGE) set(QT_I18N_SOURCE_LANGUAGE ${__qt_sps_arg_I18N_SOURCE_LANGUAGE}) endif() - - # Ensure we always use device SDK for Xcode - if(CMAKE_GENERATOR STREQUAL "Xcode") - if(${CMAKE_OSX_SYSROOT} MATCHES "^[a-z]+simulator$") - # Xcode expects the base SDK to be the device SDK - set(simulator_sysroot "${CMAKE_OSX_SYSROOT}") - string(REGEX REPLACE "simulator" "os" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") - set(CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}" CACHE STRING "" FORCE) - set(CMAKE_XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS "${simulator_sysroot}") - endif() - endif() endif() endmacro()