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>bb10
parent
b0085dbeea
commit
5be4e0ef1a
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue