diff options
| author | Liang Qi <liang.qi@digia.com> | 2013-08-02 09:38:24 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-06 08:10:27 +0200 |
| commit | c207724c9bb8e205e756086950063cc91656e401 (patch) | |
| tree | 3fa32a65de9653f1a4ec49a864b3ea9a583ce502 /src/network/ssl/qsslsocket_p.h | |
| parent | 55e22cfe0e5ff9e57a1c4eb27f55115b8914648f (diff) | |
OSX: Make QSslSocket compile on 10.9
CSSM_DATA_PTR was deprecated in 10.7. Replace SecCertificateGetData
with SecCertificateCopyData.
Task-number: QTBUG-32715
Change-Id: I762687370689b5b5c032567240667631b1ffde98
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 9369dab8e7..4fed101a80 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -79,7 +79,7 @@ QT_BEGIN_NAMESPACE #if defined(Q_OS_MACX) - typedef OSStatus (*PtrSecCertificateGetData)(SecCertificateRef, CSSM_DATA_PTR); + typedef CFDataRef (*PtrSecCertificateCopyData)(SecCertificateRef); typedef OSStatus (*PtrSecTrustSettingsCopyCertificates)(int, CFArrayRef*); typedef OSStatus (*PtrSecTrustCopyAnchorCertificates)(CFArrayRef*); #endif @@ -146,7 +146,7 @@ public: static void addDefaultCaCertificates(const QList<QSslCertificate> &certs); #if defined(Q_OS_MACX) - static PtrSecCertificateGetData ptrSecCertificateGetData; + static PtrSecCertificateCopyData ptrSecCertificateCopyData; static PtrSecTrustSettingsCopyCertificates ptrSecTrustSettingsCopyCertificates; static PtrSecTrustCopyAnchorCertificates ptrSecTrustCopyAnchorCertificates; #elif defined(Q_OS_WIN) |