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/qsslcertificate_openssl.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/qsslcertificate_openssl.cpp')
-rw-r--r-- | src/network/ssl/qsslcertificate_openssl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/network/ssl/qsslcertificate_openssl.cpp b/src/network/ssl/qsslcertificate_openssl.cpp index 1906c72ff8..065f0bfd04 100644 --- a/src/network/ssl/qsslcertificate_openssl.cpp +++ b/src/network/ssl/qsslcertificate_openssl.cpp @@ -39,6 +39,7 @@ ** ****************************************************************************/ +#include "qssl_p.h" #include "qsslsocket_openssl_symbols_p.h" #include "qsslcertificate_p.h" #include "qsslkey_p.h" @@ -303,7 +304,7 @@ static QVariant x509UnknownExtensionToValue(X509_EXTENSION *ext) else return list; } else if (meth->i2s && ext_internal) { - //qDebug() << meth->i2s(meth, ext_internal); + //qCDebug(lcSsl) << meth->i2s(meth, ext_internal); QVariant result(QString::fromUtf8(meth->i2s(meth, ext_internal))); return result; } else if (meth->i2r && ext_internal) { @@ -371,7 +372,7 @@ static QVariant x509ExtensionToValue(X509_EXTENSION *ext) result[QString::fromUtf8(QSslCertificatePrivate::asn1ObjectName(ad->method))] = uri; } else { - qWarning() << "Strange location type" << name->type; + qCWarning(lcSsl) << "Strange location type" << name->type; } } @@ -516,7 +517,7 @@ void QSslCertificatePrivate::init(const QByteArray &data, QSsl::EncodingFormat f QByteArray QSslCertificatePrivate::QByteArray_from_X509(X509 *x509, QSsl::EncodingFormat format) { if (!x509) { - qWarning("QSslSocketBackendPrivate::X509_to_QByteArray: null X509"); + qCWarning(lcSsl, "QSslSocketBackendPrivate::X509_to_QByteArray: null X509"); return QByteArray(); } @@ -551,7 +552,7 @@ QByteArray QSslCertificatePrivate::QByteArray_from_X509(X509 *x509, QSsl::Encodi QString QSslCertificatePrivate::text_from_X509(X509 *x509) { if (!x509) { - qWarning("QSslSocketBackendPrivate::text_from_X509: null X509"); + qCWarning(lcSsl, "QSslSocketBackendPrivate::text_from_X509: null X509"); return QString(); } |