replace SSL support check function with pre-processor conditional

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 3384326..761b709 100644 (file)
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -513,9 +513,7 @@ bool QSslSocketPrivate::supportsSsl()
 
 bool QSslSocketPrivate::ensureLibraryLoaded()
 {
-    if (!q_resolveOpenSslSymbols())
-        return false;
-
+#ifndef QT_NO_OPENSSL
     // Check if the library itself needs to be initialized.
     QMutexLocker locker(openssl_locks()->initLock());
     if (!s_libraryLoaded) {
@@ -558,6 +556,9 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
         }
     }
     return true;
+#else
+    return false;
+#endif // QT_NO_OPENSSL
 }
 
 void QSslSocketPrivate::ensureCiphersAndCertsLoaded()

diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index db40007..2bc6e3d 100644 (file)
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -287,15 +287,6 @@ DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYA
 DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
 DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
 
-
-bool q_resolveOpenSslSymbols()
-{
-#ifdef QT_NO_OPENSSL
-    return false;
-#endif
-    return true;
-}
-
 //==============================================================================
 // contributed by Jay Case of Sarvega, Inc.; http://sarvega.com/
 // Based on X509_cmp_time() for intitial buffer hacking.

diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
index b6ab0ed..10f7068 100644 (file)
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -98,7 +98,6 @@ QT_BEGIN_NAMESPACE
 // **************** Static declarations ******************
 
 
-bool q_resolveOpenSslSymbols();
 long q_ASN1_INTEGER_get(ASN1_INTEGER *a);
 unsigned char * q_ASN1_STRING_data(ASN1_STRING *a);
 int q_ASN1_STRING_length(ASN1_STRING *a);