diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-04-27 11:09:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-03 16:02:12 +0200 |
| commit | 7dde77f6fc5385bf978fe95da3ca3230758cc5b5 (patch) | |
| tree | 39dd1b71bf5935b3d798b20caecb522992f664e9 | |
| parent | 77ee9c911cb21b2a6013aac0d62617904ff0d4b1 (diff) | |
| download | qtwebengine-chromium-7dde77f6fc5385bf978fe95da3ca3230758cc5b5.tar.gz | |
Fix build when minimum macOS deployment target is higher than 10.9
The deployment target will always be higher than 10.9, because
Qt 5.9 requires it to be at least 10.10.
Task-number: QTBUG-60438
Change-Id: I5a97ba828f7267731e50010c4345caa19bb8939a
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | chromium/content/common/quarantine/quarantine_mac.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chromium/content/common/quarantine/quarantine_mac.mm b/chromium/content/common/quarantine/quarantine_mac.mm index c407233d593..3a5880d21b6 100644 --- a/chromium/content/common/quarantine/quarantine_mac.mm +++ b/chromium/content/common/quarantine/quarantine_mac.mm @@ -244,7 +244,10 @@ bool AddQuarantineMetadataToFile(const base::FilePath& file, if (base::mac::IsAtLeastOS10_10()) { success = GetQuarantineProperties(file, &properties); } else { +#if !defined(MAC_OS_X_VERSION_10_10) || \ + MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 success = GetQuarantinePropertiesDeprecated(file, &properties); +#endif } if (!success) @@ -288,7 +291,12 @@ bool AddQuarantineMetadataToFile(const base::FilePath& file, if (base::mac::IsAtLeastOS10_10()) { return SetQuarantineProperties(file, properties); } else { +#if !defined(MAC_OS_X_VERSION_10_10) || \ + MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10 return SetQuarantinePropertiesDeprecated(file, properties); +#else + return false; +#endif } } |