···11-diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf22-index b77494ec..470c38e7 10064433---- a/mkspecs/common/mac.conf44-+++ b/mkspecs/common/mac.conf55-@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \66-77- QMAKE_FIX_RPATH = install_name_tool -id88-99--QMAKE_LFLAGS_RPATH = -Wl,-rpath,1010-+QMAKE_LFLAGS_RPATH =1111- QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip1212-1313- QMAKE_LFLAGS_REL_RPATH =1414-diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf1515-index d052808c..b80ec1e8 1006441616---- a/mkspecs/features/mac/default_post.prf1717-+++ b/mkspecs/features/mac/default_post.prf1818-@@ -68,208 +68,6 @@ qt {1919- }2020- }2121-2222--# Add the same default rpaths as Xcode does for new projects.2323--# This is especially important for iOS/tvOS/watchOS where no other option is possible.2424--!no_default_rpath {2525-- QMAKE_RPATHDIR += @executable_path/../Frameworks2626-- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks2727--}2828--2929--# Don't pass -headerpad_max_install_names when using Bitcode.3030--# In that case the linker emits a warning stating that the flag is ignored when3131--# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962).3232--# Using this flag is also unnecessary in practice on UIKit platforms since they3333--# are sandboxed, and only UIKit platforms support bitcode to begin with.3434--!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD3535--3636--app_extension_api_only {3737-- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION3838-- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION3939-- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION4040-- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION4141--}4242--4343--macx-xcode {4444-- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO4545-- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \4646-- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO4747-- else: \4848-- qmake_pkginfo_typeinfo.value = "????"4949-- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo5050--5151-- bundle_version = $$VERSION5252-- isEmpty(bundle_version): bundle_version = 1.0.05353--5454-- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three5555-- VER_MAJ = $$member(l, 0, 0)5656-- VER_MIN = $$member(l, 1, 1)5757-- VER_PAT = $$member(l, 2, 2)5858-- unset(l)5959--6060-- qmake_full_version.name = QMAKE_FULL_VERSION6161-- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}6262-- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version6363--6464-- qmake_short_version.name = QMAKE_SHORT_VERSION6565-- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN}6666-- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version6767--6868-- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) {6969-- debug_information_format.name = DEBUG_INFORMATION_FORMAT7070-- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT7171-- debug_information_format.build = debug7272-- QMAKE_MAC_XCODE_SETTINGS += debug_information_format7373-- }7474--7575-- QMAKE_XCODE_ARCHS =7676--7777-- arch_device.name = "ARCHS[sdk=$${device.sdk}*]"7878-- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS7979-- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS8080-- QMAKE_MAC_XCODE_SETTINGS += arch_device8181--8282-- simulator {8383-- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]"8484-- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS8585-- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS8686-- QMAKE_MAC_XCODE_SETTINGS += arch_simulator8787-- }8888--8989-- only_active_arch.name = ONLY_ACTIVE_ARCH9090-- only_active_arch.value = YES9191-- only_active_arch.build = debug9292-- QMAKE_MAC_XCODE_SETTINGS += only_active_arch9393--} else {9494-- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS9595-- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS9696-- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS9797--9898-- isEmpty(VALID_ARCHS): \9999-- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")100100--101101-- single_arch: VALID_ARCHS = $$first(VALID_ARCHS)102102--103103-- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))104104-- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))105105--106106-- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS107107--108108-- arch_flags = $(EXPORT_ARCH_ARGS)109109--110110-- QMAKE_CFLAGS += $$arch_flags111111-- QMAKE_CXXFLAGS += $$arch_flags112112-- QMAKE_LFLAGS += $$arch_flags113113--114114-- QMAKE_PCH_ARCHS = $$VALID_ARCHS115115--116116-- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET117117-- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET118118-- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET119119-- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET120120--121121-- # If we're doing a simulator and device build, device and simulator122122-- # architectures use different paths and flags for the sysroot and123123-- # deployment target switch, so we must multiplex them across multiple124124-- # architectures using -Xarch. Otherwise we fall back to the simple path.125125-- # This is not strictly necessary, but results in cleaner command lines126126-- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit127127-- # individual rules to a different set of architecture(s) from the overall128128-- # build (such as machtest in QtCore).129129-- simulator:device {130130-- QMAKE_XARCH_CFLAGS =131131-- QMAKE_XARCH_LFLAGS =132132-- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS133133--134134-- for (arch, VALID_ARCHS) {135135-- contains(VALID_SIMULATOR_ARCHS, $$arch) {136136-- sdk = $$simulator.sdk137137-- version_identifier = $$simulator.deployment_identifier138138-- } else {139139-- sdk = $$device.sdk140140-- version_identifier = $$device.deployment_identifier141141-- }142142--143143-- version_min_flags = \144144-- -Xarch_$${arch} \145145-- -m$${version_identifier}-version-min=$$deployment_target146146-- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \147147-- -Xarch_$${arch} \148148-- -isysroot$$xcodeSDKInfo(Path, $$sdk)149149-- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \150150-- -Xarch_$${arch} \151151-- -isysroot$$xcodeSDKInfo(Path, $$sdk)152152--153153-- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})154154-- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})155155--156156-- QMAKE_EXTRA_VARIABLES += \157157-- QMAKE_XARCH_CFLAGS_$${arch} \158158-- QMAKE_XARCH_LFLAGS_$${arch}159159-- }160160--161161-- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)162162-- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS)163163-- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS)164164-- } else {165165-- simulator: \166166-- version_identifier = $$simulator.deployment_identifier167167-- else: \168168-- version_identifier = $$device.deployment_identifier169169-- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target170170-- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag171171-- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag172172-- QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag173173-- }174174--175175-- # Enable precompiled headers for multiple architectures176176-- QMAKE_CFLAGS_USE_PRECOMPILE =177177-- for (arch, VALID_ARCHS) {178178-- icc_pch_style: \179179-- use_flag = "-pch-use "180180-- else: \181181-- use_flag = -include182182--183183-- # Only use Xarch with multi-arch, as the option confuses ccache184184-- count(VALID_ARCHS, 1, greaterThan): \185185-- QMAKE_CFLAGS_USE_PRECOMPILE += \186186-- -Xarch_$${arch}187187--188188-- QMAKE_CFLAGS_USE_PRECOMPILE += \189189-- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}}190190-- }191191-- icc_pch_style {192192-- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT}193193-- QMAKE_CFLAGS_USE_PRECOMPILE =194194-- } else {195195-- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE196196-- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE197197-- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE198198-- }199199--200200-- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}201201--}202202--203203--!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) {204204-- # Explicit SDK version has been set, respect that205205-- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version206206--}207207--208208--cache(QMAKE_XCODE_DEVELOPER_PATH, stash)209209--!isEmpty(QMAKE_XCODE_VERSION): \210210-- cache(QMAKE_XCODE_VERSION, stash)211211--212212--QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix()213213--214214--xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER215215--xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX216216--isEmpty(xcode_product_bundle_identifier_setting.value): \217217-- xcode_product_bundle_identifier_setting.value = "com.yourcompany"218218--xcode_product_bundle_target = $$QMAKE_BUNDLE219219--isEmpty(xcode_product_bundle_target): \220220-- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier}221221--xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}"222222--QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting223223--224224- !macx-xcode {225225- generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS226226- generate_xcode_project.target = xcodeproj227227-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf228228-index e3534561..3b01424e 100644229229---- a/mkspecs/features/mac/default_pre.prf230230-+++ b/mkspecs/features/mac/default_pre.prf231231-@@ -1,60 +1,2 @@232232- CONFIG = asset_catalogs rez $$CONFIG233233- load(default_pre)234234--235235--isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {236236-- # Get path of Xcode's Developer directory237237-- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null")238238-- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \239239-- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.")240240--241241-- # Make sure Xcode path is valid242242-- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \243243-- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")244244--}245245--246246--isEmpty(QMAKE_XCODEBUILD_PATH): \247247-- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null")248248--249249--!isEmpty(QMAKE_XCODEBUILD_PATH) {250250-- # Make sure Xcode is set up properly251251-- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \252252-- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.")253253--254254-- isEmpty(QMAKE_XCODE_VERSION) {255255-- # Extract Xcode version using xcodebuild256256-- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version")257257-- QMAKE_XCODE_VERSION = $$member(xcode_version, 1)258258-- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")259259-- unset(xcode_version)260260-- }261261--}262262--263263--isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) {264264-- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist265265-- exists($$QMAKE_XCODE_PREFERENCES_FILE): \266266-- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null")267267--268268-- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \269269-- cache(QMAKE_TARGET_BUNDLE_PREFIX)270270--}271271--272272--QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon273273--274274--# Make the default debug info format for static debug builds275275--# DWARF instead of DWARF with dSYM. This cuts down build times276276--# for application debug builds significantly, as Xcode doesn't277277--# have to pull out all the DWARF info from the Qt static libs278278--# and put it into a dSYM file. We don't need that dSYM file in279279--# the first place, since the information is available in the280280--# object files inside the archives (static libraries).281281--macx-xcode:qtConfig(static): \282282-- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf283283--284284--# This variable is used by the xcode_dynamic_library_suffix285285--# feature, which allows Xcode to choose the Qt libraries to link to286286--# at build time, depending on the current Xcode SDK and configuration.287287--QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX288288--289289--xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP290290--xcode_copy_phase_strip_setting.value = NO291291--QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting292292-diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk293293-index c40f58c9..e69de29b 100644294294---- a/mkspecs/features/mac/sdk.mk295295-+++ b/mkspecs/features/mac/sdk.mk296296-@@ -1,25 +0,0 @@297297--298298--ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)299299-- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1300300-- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))301301-- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))302302-- # We don't want to complain about out of date SDK unless the target needs to be remade.303303-- # This covers use-cases such as running 'make check' after moving the build to a304304-- # computer without Xcode or with a different Xcode version.305305-- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0)306306-- ifeq ($(TARGET_UP_TO_DATE),0)307307-- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),)308308-- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.)309309-- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),)310310-- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.)311311-- else ifneq ($(CURRENT_MAC_SDK_VERSION),)312312-- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)313313-- else314314-- $(info Unknown error resolving current platform SDK version.)315315-- endif316316-- $(info This requires a fresh build. Please wipe the build directory completely,)317317-- $(info including any .qmake.stash and .qmake.cache files generated by qmake.)318318-- $(error ^)319319-- endif320320-- endif321321--endif322322-diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf323323-index 3a9c2778..e69de29b 100644324324---- a/mkspecs/features/mac/sdk.prf325325-+++ b/mkspecs/features/mac/sdk.prf326326-@@ -1,61 +0,0 @@327327--328328--isEmpty(QMAKE_MAC_SDK): \329329-- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.")330330--331331--contains(QMAKE_MAC_SDK, .*/.*): \332332-- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)")333333--334334--defineReplace(xcodeSDKInfo) {335335-- info = $$1336336-- equals(info, "Path"): \337337-- infoarg = --show-sdk-path338338-- equals(info, "PlatformPath"): \339339-- infoarg = --show-sdk-platform-path340340-- equals(info, "SDKVersion"): \341341-- infoarg = --show-sdk-version342342-- sdk = $$2343343-- isEmpty(sdk): \344344-- sdk = $$QMAKE_MAC_SDK345345--346346-- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {347347-- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")348348-- # --show-sdk-platform-path won't work for Command Line Tools; this is fine349349-- # only used by the XCTest backend to testlib350350-- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \351351-- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")352352-- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})353353-- }354354--355355-- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info}))356356--}357357--358358--QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path)359359--QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath)360360--QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion)361361--362362--isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) {363363-- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL364364-- sysrootified =365365-- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val366366-- QMAKE_INCDIR_OPENGL = $$sysrootified367367--}368368--369369--QMAKESPEC_NAME = $$basename(QMAKESPEC)370370--371371--# Resolve SDK version of various tools372372--for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) {373373-- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool}374374-- !isEmpty($$tool_variable) {375375-- $$tool = $$eval($$tool_variable)376376-- next()377377-- }378378--379379-- value = $$eval($$tool)380380-- isEmpty(value): next()381381--382382-- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null")383383-- isEmpty(sysrooted): next()384384--385385-- $$tool = $$sysrooted $$member(value, 1, -1)386386-- cache($$tool_variable, set stash, $$tool)387387--}
···11-diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm22-index a367487e..c3aeca1d 10064433---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm44-+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm55-@@ -49,6 +49,11 @@66- // but was only added in the 10.14 SDK, so declare it just in case.77- extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);88-99-+// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html1010-+#if !defined(kIOSurfaceSuccess)1111-+#define kIOSurfaceSuccess KERN_SUCCESS1212-+#endif1313-+1414- QT_BEGIN_NAMESPACE1515-1616- Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
···11-Fix a following build error:22-33-In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7:44-../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|."55- static_assert(66- ^77-../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here88- : AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... {99- ^1010-../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here1111- static_assert(internal::AssertBindArgsValidity<1212- ^1313-../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here1414- return base::BindRepeating(std::forward<Functor>(functor),1515- ^1616-../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here1717- base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,1818- ^1919-2020-Resurrected from https://github.com/NixOS/nixpkgs/blob/ddcf01bca6c7a7a7f096bec836a1e6a707ad473d/pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch because the same problem is present in 5.12 when compiling on macOS.2121-2222---- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm2323-+++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm2424-@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic(2525- base::ThreadTaskRunnerHandle::Get()->PostTask(2626- FROM_HERE,2727- base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,2828-- weak_ptr_factory_.GetWeakPtr(), nil));2929-+ weak_ptr_factory_.GetWeakPtr(), nullptr));3030- }3131- }
···11-diff --git a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm22-index a367487e..c3aeca1d 10064433---- a/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm44-+++ b/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.mm55-@@ -49,6 +49,11 @@66- // but was only added in the 10.14 SDK, so declare it just in case.77- extern "C" CFPropertyListRef CGColorSpaceCopyPropertyList(CGColorSpaceRef space);88-99-+// Introduced in 10.13: http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.13/IOSurface.html1010-+#if !defined(kIOSurfaceSuccess)1111-+#define kIOSurfaceSuccess KERN_SUCCESS1212-+#endif1313-+1414- QT_BEGIN_NAMESPACE1515-1616- Q_LOGGING_CATEGORY(lcQpaIOSurface, "qt.qpa.backingstore.iosurface");
···11-diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf22---- a/mkspecs/features/platform.prf33-+++ b/mkspecs/features/platform.prf44-@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {55- } else:osx {66- # FIXME: Try to get it back down to 8.2 for building on OS X 10.1177- !isMinXcodeVersion(8, 3, 3) {88-- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.")99-- return(false)1010- }1111- !clang|intel_icc {1212- skipBuild("Qt WebEngine on macOS requires Clang.")1313-@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) {1414- return(false)1515- }1616- !isMinOSXSDKVersion(10, 12): {1717-- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")1818-- return(false)1919- }2020- } else {2121- skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")2222-diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri2323---- a/src/core/config/mac_osx.pri2424-+++ b/src/core/config/mac_osx.pri2525-@@ -5,8 +5,6 @@ load(functions)2626- # otherwise query for it.2727- QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)2828- isEmpty(QMAKE_MAC_SDK_VERSION) {2929-- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")3030-- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")3131- }3232-3333- QMAKE_CLANG_DIR = "/usr"
···792792 librsync_0_9 = throw "librsync_0_9 has been removed"; # Added 2021-07-24793793 librewolf-wayland = librewolf; # Added 2022-11-15794794 libseat = seatd; # Added 2021-06-24795795+ libsForQt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24796796+ libsForQt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-24797797+ libsForQt515 = libsForQt5; # Added 2022-11-24795798 libspotify = throw "libspotify has been removed because Spotify stopped supporting it"; # added 2022-05-29796799 libstdcxxHook = throw "libstdcxx hook has been removed because cc-wrapper is now directly aware of the c++ standard library intended to be used"; # Added 2020-06-22797800 libsysfs = throw "'libsysfs' has been renamed to/replaced by 'sysfsutils'"; # Converted to throw 2022-02-22···12691266 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-0212701267 qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-1412711268 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-1512691269+ qt512 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-2412701270+ qt514 = throw "Qt 5 versions prior to 5.15 are no longer supported upstream and have been removed"; # Added 2022-11-2412711271+ qt515 = qt5; # Added 2022-11-2412721272 qt5ct = libsForQt5.qt5ct; # Added 2021-12-2712731273 qtcurve = libsForQt5.qtcurve; # Added 2020-11-0712741274 qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # Added 2021-08-04