Remove QT_NO_SSL checks

They are not longer needed.

Change-Id: I15967d3b4ffcb5c64ec64aedcf55069ccb7697b1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

7 files changed, 3 insertions, 29 deletions

diff --git a/src/core/api/qwebengineclientcertificatestore.h b/src/core/api/qwebengineclientcertificatestore.h
index 31a6b9c38..a9282f0fb 100644
--- a/src/core/api/qwebengineclientcertificatestore.h
+++ b/src/core/api/qwebengineclientcertificatestore.h
@@ -41,7 +41,9 @@
 #define QWEBENGINECLIENTCERTIFICATESTORE_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
+#include <QtNetwork/qtnetwork-config.h>
 
+#if QT_CONFIG(ssl)
 #include <QtCore/qlist.h>
 #include <QtNetwork/qsslcertificate.h>
 #include <QtNetwork/qsslkey.h>
@@ -53,8 +55,6 @@ class ProfileAdapter;
 
 QT_BEGIN_NAMESPACE
 
-#if QT_CONFIG(ssl)
-
 class Q_WEBENGINECORE_EXPORT QWebEngineClientCertificateStore {
 
 public:
@@ -72,8 +72,7 @@ private:
     QtWebEngineCore::ClientCertificateStoreData *m_storeData;
 };
 
-#endif // QT_CONFIG(ssl)
-
 QT_END_NAMESPACE
 
+#endif // QT_CONFIG(ssl)
 #endif // QWebEngineClientCertificateStore_H
diff --git a/src/core/client_cert_select_controller.cpp b/src/core/client_cert_select_controller.cpp
index e0530bf44..2f2d24716 100644
--- a/src/core/client_cert_select_controller.cpp
+++ b/src/core/client_cert_select_controller.cpp
@@ -71,8 +71,6 @@ ClientCertSelectController::~ClientCertSelectController()
         m_delegate->ContinueWithCertificate(nullptr, nullptr);
 }
 
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
-
 void ClientCertSelectController::selectNone()
 {
     if (m_selected) {
@@ -142,5 +140,4 @@ QList<QSslCertificate> ClientCertSelectController::certificates() const
     return m_certificates;
 }
 
-#endif // !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
 }
diff --git a/src/core/client_cert_select_controller.h b/src/core/client_cert_select_controller.h
index 72f89f720..3a733f56f 100644
--- a/src/core/client_cert_select_controller.h
+++ b/src/core/client_cert_select_controller.h
@@ -55,10 +55,8 @@
 #include <QtNetwork/qtnetwork-config.h>
 
 #include <QtCore/QUrl>
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
 #include <QtCore/QList>
 #include <QtNetwork/QSslCertificate>
-#endif
 #include <memory>
 
 namespace content {
@@ -80,13 +78,11 @@ public:
     ~ClientCertSelectController();
 
     QUrl hostAndPort() const { return m_hostAndPort; }
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
     void selectNone();
     void select(const QSslCertificate &certificate);
     void select(int index);
 
     QList<QSslCertificate> certificates() const;
-#endif
 
 private:
     QUrl m_hostAndPort;
diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp b/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
index 77f74c17f..febfe0a21 100644
--- a/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
+++ b/src/webenginewidgets/api/qwebengineclientcertificateselection.cpp
@@ -38,9 +38,6 @@
 ****************************************************************************/
 
 #include "qwebengineclientcertificateselection.h"
-
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
-
 #include "client_cert_select_controller.h"
 
 QT_BEGIN_NAMESPACE
@@ -125,4 +122,3 @@ QUrl QWebEngineClientCertificateSelection::host() const
 
 QT_END_NAMESPACE
 
-#endif // !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
diff --git a/src/webenginewidgets/api/qwebengineclientcertificateselection.h b/src/webenginewidgets/api/qwebengineclientcertificateselection.h
index 2f794d5b0..165194aac 100644
--- a/src/webenginewidgets/api/qwebengineclientcertificateselection.h
+++ b/src/webenginewidgets/api/qwebengineclientcertificateselection.h
@@ -42,9 +42,6 @@
 
 #include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h>
 #include <QtNetwork/qtnetwork-config.h>
-
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
-
 #include <QtCore/qlist.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtNetwork/qsslcertificate.h>
@@ -79,6 +76,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
-
 #endif // QWEBENGINECLIENTCERTSELECTION_H
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index f211347f1..dce3142bb 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1727,17 +1727,12 @@ void QWebEnginePagePrivate::allowCertificateError(const QWebEngineCertificateErr
 
 void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSelectController> &controller)
 {
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
     Q_Q(QWebEnginePage);
     QWebEngineClientCertificateSelection certSelection(controller);
 
     Q_EMIT q->selectClientCertificate(certSelection);
-#else
-    Q_UNUSED(controller);
-#endif
 }
 
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
 /*!
     \fn void QWebEnginePage::selectClientCertificate(QWebEngineClientCertificateSelection clientCertificateSelection)
     \since 5.12
@@ -1753,7 +1748,6 @@ void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSele
 
     \sa QWebEngineClientCertificateSelection
 */
-#endif
 
 void QWebEnginePagePrivate::javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID)
 {
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index 102f36a30..055c9ee46 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -337,10 +337,7 @@ Q_SIGNALS:
     void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
     void quotaRequested(QWebEngineQuotaRequest quotaRequest);
     void registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request);
-#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)
     void selectClientCertificate(QWebEngineClientCertificateSelection clientCertSelection);
-#endif
-
     void authenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator);
     void proxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator, const QString &proxyHost);