diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-12-08 13:35:47 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2014-12-10 11:07:46 +0100 |
commit | f17d7a124f0fa817a7e1a2dda6f48098432c0dc0 (patch) | |
tree | ac5b4e3713af87a82add0cebc5a6628997435ed2 /src/network/ssl/qsslsocket_openssl_symbols.cpp | |
parent | 7d2357b0a8911191451fd89279ba30e5fd6ccb84 (diff) |
Use categorized logging for ssl code
Place all debug output into the 'qt.network.ssl' category.
This allows people to disable certain warnings at runtime.
Task-number: QTBUG-43173
Change-Id: Ide731fae3109f9cd7730cc096ee069a5b99d35f1
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_symbols.cpp')
-rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp index 71b8237e03..ea6e84adef 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp @@ -47,6 +47,7 @@ ** ****************************************************************************/ +#include "qssl_p.h" #include "qsslsocket_openssl_symbols_p.h" #ifdef Q_OS_WIN @@ -115,12 +116,12 @@ QT_BEGIN_NAMESPACE namespace { void qsslSocketUnresolvedSymbolWarning(const char *functionName) { - qWarning("QSslSocket: cannot call unresolved function %s", functionName); + qCWarning(lcSsl, "QSslSocket: cannot call unresolved function %s", functionName); } void qsslSocketCannotResolveSymbolWarning(const char *functionName) { - qWarning("QSslSocket: cannot resolve %s", functionName); + qCWarning(lcSsl, "QSslSocket: cannot resolve %s", functionName); } } @@ -388,11 +389,11 @@ DEFINEFUNC(void, PKCS12_free, PKCS12 *pkcs12, pkcs12, return, DUMMYARG) #ifdef QT_NO_LIBRARY bool q_resolveOpenSslSymbols() { - qWarning("QSslSocket: unable to resolve symbols. " - "QT_NO_LIBRARY is defined which means runtime resolving of " - "libraries won't work."); - qWarning("Either compile Qt statically or with support for runtime resolving " - "of libraries."); + qCWarning(lcSsl, "QSslSocket: unable to resolve symbols. " + "QT_NO_LIBRARY is defined which means runtime resolving of " + "libraries won't work."); + qCWarning(lcSsl, "Either compile Qt statically or with support for runtime resolving " + "of libraries."); return false; } #else @@ -992,7 +993,7 @@ QDateTime q_getTimeFromASN1(const ASN1_TIME *aTime) return result; } else { - qWarning("unsupported date format detected"); + qCWarning(lcSsl, "unsupported date format detected"); return QDateTime(); } |