diff options
| author | Jing Bai <jing.t.bai@nokia.com> | 2012-09-03 10:50:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-24 17:06:48 +0200 |
| commit | 37e3168abcec7a32bced3e1995441d89a0796af1 (patch) | |
| tree | 279b4ca5a0f90c503ee9f606f7ea814ad8f1e09b /src | |
| parent | 57b4a504ff1960c4f78308f46c04922cfd58356e (diff) | |
wrap QLibrary related code with QT_NO_LIBRARY
To fix a compile error when QT_NO_LIBRARY is defined.
Change-Id: Ie72b60b8204641fa05f4cdbf66e908cb3526217e
Reviewed-by: Jing Bai <jing.bai@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index 204278ebbb..c25ebd5aa3 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -633,6 +633,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded() resetDefaultCiphers(); +#ifndef QT_NO_LIBRARY //load symbols needed to receive certificates from system store #if defined(Q_OS_MAC) && !defined(Q_OS_IOS) QLibrary securityLib("/System/Library/Frameworks/Security.framework/Versions/Current/Security"); @@ -680,6 +681,7 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded() } } #endif +#endif //QT_NO_LIBRARY // if on-demand loading was not enabled, load the certs now if (!s_loadRootCertsOnDemand) setDefaultCaCertificates(systemCaCertificates()); |