diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-07-30 13:34:24 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-07-30 14:56:18 +0000 |
| commit | 5be4e0ef1a3fdbd7462d5ceed15927012a01c07f (patch) | |
| tree | 651c0c01665d2ded9edd5a3e2694ed7da45d532b /src/network/ssl/qdtls.cpp | |
| parent | b0085dbeeac47d0ce566750d93f1b1f865d07cdb (diff) | |
Remove redundant #if-ery
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 <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qdtls.cpp')
| -rw-r--r-- | src/network/ssl/qdtls.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
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); |