From 5be4e0ef1a3fdbd7462d5ceed15927012a01c07f Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 30 Jul 2018 13:34:24 +0200 Subject: Remove redundant #if-ery MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As now the feature 'dtls' depends on the feature 'openssl' - ifdefs are redundant, this code is always 'openssl-only'. Change-Id: I6a7fe9e3a00ae05656af1626e7de74e813df5d32 Reviewed-by: Edward Welbourne Reviewed-by: Mårten Nordheim --- src/network/ssl/qdtls.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/network') diff --git a/src/network/ssl/qdtls.cpp b/src/network/ssl/qdtls.cpp index cdb600538f..afa135845a 100644 --- a/src/network/ssl/qdtls.cpp +++ b/src/network/ssl/qdtls.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qsslconfiguration.h" +#include "qdtls_openssl_p.h" #include "qudpsocket.h" #include "qdtls_p.h" #include "qssl_p.h" @@ -45,10 +46,6 @@ #include "qglobal.h" -#if QT_CONFIG(openssl) -#include "qdtls_openssl_p.h" -#endif // QT_CONFIG - QT_BEGIN_NAMESPACE namespace @@ -122,9 +119,7 @@ bool QDtlsBasePrivate::setCookieGeneratorParameters(QCryptographicHash::Algorith } QDtlsClientVerifier::QDtlsClientVerifier(QObject *parent) -#if QT_CONFIG(openssl) : QObject(*new QDtlsClientVerifierOpenSSL, parent) -#endif // openssl { Q_D(QDtlsClientVerifier); @@ -198,9 +193,7 @@ QString QDtlsClientVerifier::dtlsErrorString() const } QDtls::QDtls(QSslSocket::SslMode mode, QObject *parent) -#if QT_CONFIG(openssl) : QObject(*new QDtlsPrivateOpenSSL, parent) -#endif { Q_D(QDtls); -- cgit v1.2.3