diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-07 13:36:40 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-08 01:09:38 +0200 |
| commit | e255146183d3a1dd9491fd4090cdf4a5244ce754 (patch) | |
| tree | a79643ffe4f8bfa672dde1c21510b19fa12b9745 /src/network | |
| parent | 4f952aaea13adfc2d271ed98f111fc8f6d9614ef (diff) | |
Replace use of deprecated Q_OS_MACX in favor of Q_OS_MACOS
Change-Id: I1059d56f67be28a4cc1a66b744e81df6d0b5d00d
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 2 | ||||
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index debdaaa5d4..27801621db 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -102,7 +102,7 @@ Q_GLOBAL_STATIC(QNetworkAccessFtpBackendFactory, ftpBackend) Q_GLOBAL_STATIC(QNetworkAccessDebugPipeBackendFactory, debugpipeBackend) #endif -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) bool getProxyAuth(const QString& proxyHostname, const QString &scheme, QString& username, QString& password) { OSStatus err; diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 41bddeac81..170fbb6b35 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -83,7 +83,7 @@ class QSslContext; QT_BEGIN_NAMESPACE -#if defined(Q_OS_MACX) +#if defined(Q_OS_MACOS) typedef CFDataRef (*PtrSecCertificateCopyData)(SecCertificateRef); typedef OSStatus (*PtrSecTrustSettingsCopyCertificates)(int, CFArrayRef*); typedef OSStatus (*PtrSecTrustCopyAnchorCertificates)(CFArrayRef*); |