summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorTimur Pocheptsov <timur.pocheptsov@theqtcompany.com>2016-07-29 15:18:34 +0200
committerTimur Pocheptsov <timur.pocheptsov@theqtcompany.com>2016-07-29 16:51:53 +0000
commit7876add8b13e166711dc42e458baab43d50999d2 (patch)
treed98e389bf0f075989575c441be3c8396e515189d /src/network
parenta5c851598c96a9b7c9b0fd9b38b4f7aec42322de (diff)
QSslDiffieHellmanParameters_dummy - remove Q_UNIMPLEMENTED
As a part of SSL initialization (done by QNAM on the first HTTP get request, for example), 'dummy' Diffie/Hellman parameter's mem-functions constantly and unconditionally print 'Unimplemented code' even without user actually calling these unimplemented methods. This is not just annoying, (just realized I saw this 'Unimplemented code' many times today) this also breaks several our auto-tests (xmlpatterns/qquickimage for example) - the ones that expect output to be empty. Task-number: QTBUG-55003 Change-Id: I5e4822e9783de32aa4b00843a9916eafea3689c0 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/network')
-rw-r--r--src/network/ssl/qssldiffiehellmanparameters_dummy.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/network/ssl/qssldiffiehellmanparameters_dummy.cpp b/src/network/ssl/qssldiffiehellmanparameters_dummy.cpp
index 42222f3f38..220c017f4c 100644
--- a/src/network/ssl/qssldiffiehellmanparameters_dummy.cpp
+++ b/src/network/ssl/qssldiffiehellmanparameters_dummy.cpp
@@ -48,12 +48,10 @@ QT_BEGIN_NAMESPACE
void QSslDiffieHellmanParametersPrivate::decodeDer(const QByteArray &)
{
- Q_UNIMPLEMENTED();
}
void QSslDiffieHellmanParametersPrivate::decodePem(const QByteArray &)
{
- Q_UNIMPLEMENTED();
}
QT_END_NAMESPACE