summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2014-10-28 16:06:43 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2014-10-30 10:52:32 +0100
commit6c58c9b3ec78ecdd3f72f601041ac34bf2c59320 (patch)
tree9c3b95e9b8dcd6bb41d7ad6ec83f22a20822f497
parent51ec20d93e97c777fc89e96d8d035d999c8a4ad9 (diff)
clang: Fix compilation with -openssl-linked
Fixes errors like qsslsocket_openssl_symbols.cpp:111:6: error: unused function 'qsslSocketUnresolvedSymbolWarning' [-Werror,-Wunused-function] void qsslSocketUnresolvedSymbolWarning(const char *functionName) ^ 1 error generated. Change-Id: I164518de583f080724ab9a7165c885602a1c6231 Reviewed-by: Richard J. Moore <rich@kde.org>
-rw-r--r--src/network/ssl/qsslsocket_openssl_symbols.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index d919d8e934..f4562cdb21 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -107,6 +107,8 @@ QT_BEGIN_NAMESPACE
possibly with a different version of OpenSSL.
*/
+#ifndef QT_LINKED_OPENSSL
+
namespace {
void qsslSocketUnresolvedSymbolWarning(const char *functionName)
{
@@ -119,6 +121,8 @@ void qsslSocketCannotResolveSymbolWarning(const char *functionName)
}
}
+#endif // QT_LINKED_OPENSSL
+
#ifdef SSLEAY_MACROS
DEFINEFUNC3(void *, ASN1_dup, i2d_of_void *a, a, d2i_of_void *b, b, char *c, c, return 0, return)
#endif