From 37e3168abcec7a32bced3e1995441d89a0796af1 Mon Sep 17 00:00:00 2001 From: Jing Bai Date: Mon, 3 Sep 2012 10:50:13 +0200 Subject: [PATCH] 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 Reviewed-by: Richard J. Moore --- src/network/ssl/qsslsocket_openssl.cpp | 2 ++ 1 file changed, 2 insertions(+) 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());