diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-10-04 16:06:34 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2019-10-09 13:45:03 +0000 |
| commit | 8c785066d987b663ed7d3386151ec8144c31cdcc (patch) | |
| tree | f17afaa12bf21927d027a1bf044e4fccda2ec37e | |
| parent | 3449634e50a8bc18b35aa28d06b17540cbb00ffe (diff) | |
| download | qtwebengine-chromium-8c785066d987b663ed7d3386151ec8144c31cdcc.tar.gz | |
Workaround presumably wrong macOS SDK detection
Task-number: QTBUG-78997
Change-Id: If2915cadda10bc29e9a5596dda0b39fa57623167
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Dmitriy Kuminov <coding@dmik.org>
| -rw-r--r-- | chromium/base/mac/foundation_util.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/base/mac/foundation_util.h b/chromium/base/mac/foundation_util.h index 8626046ab06..430ab8d64cb 100644 --- a/chromium/base/mac/foundation_util.h +++ b/chromium/base/mac/foundation_util.h @@ -53,7 +53,10 @@ typedef CR_FORWARD_ENUM(unsigned int, NSSearchPathDirectory); typedef unsigned int NSSearchPathDomainMask; #endif -#if defined(OS_IOS) || defined(MAC_OS_X_VERSION_10_15) +// The CSSM_DEPRECATED check is a workaround for a presumably wrong MacOSX SDK detection. +// This macro was added to the Security.framework in the 10.15 SDK: +// http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.15/Security.html at SecBase.h +#if defined(OS_IOS) || (defined(MAC_OS_X_VERSION_10_15) && defined(CSSM_DEPRECATED)) typedef struct CF_BRIDGED_TYPE(id) __SecCertificate* SecCertificateRef; typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef; typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef; |