diff options
author | Jake Petroules <jake.petroules@qt.io> | 2016-05-19 23:01:59 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2016-08-19 21:05:55 +0000 |
commit | 57378a108ca488cbf5cfaa32590fc762dcbf3315 (patch) | |
tree | 3a8a3851959f6fc06d0a1c65ac9fa16508e12ee4 /src/network/ssl | |
parent | 2f108fafe98047f9ed2c85c5938579fdeb90682d (diff) |
Add support for Apple watchOS
Change-Id: I3f9e00569458a463af2eaa5a3a16a6afd1e9c1ea
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/network/ssl')
-rw-r--r-- | src/network/ssl/qsslsocket_mac.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_mac.cpp b/src/network/ssl/qsslsocket_mac.cpp index 438ea9a38e..4c06404415 100644 --- a/src/network/ssl/qsslsocket_mac.cpp +++ b/src/network/ssl/qsslsocket_mac.cpp @@ -204,7 +204,7 @@ bool QSslSocketPrivate::s_loadedCiphersAndCerts = false; bool QSslSocketPrivate::s_loadRootCertsOnDemand = false; -#if !defined(QT_PLATFORM_UIKIT) // dhparam is not used on iOS or tvOS. (see the SSLSetDiffieHellmanParams call below) +#if !defined(QT_PLATFORM_UIKIT) // dhparam is only used on macOS. (see the SSLSetDiffieHellmanParams call below) static const uint8_t dhparam[] = "\x30\x82\x01\x08\x02\x82\x01\x01\x00\x97\xea\xd0\x46\xf7\xae\xa7\x76\x80" "\x9c\x74\x56\x98\xd8\x56\x97\x2b\x20\x6c\x77\xe2\x82\xbb\xc8\x84\xbe\xe7" @@ -223,7 +223,7 @@ static const uint8_t dhparam[] = "\x90\x0b\x35\x64\xff\xd9\xe3\xac\xf2\xf2\xeb\x3a\x63\x02\x01\x02"; #endif -// No ioErr on iOS/tvOS. (defined in MacErrors.h on OS X) +// No ioErr on iOS/tvOS/watchOS. (defined in MacErrors.h on macOS) #if defined(QT_PLATFORM_UIKIT) # define ioErr -36 #endif |