diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-22 17:24:13 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-23 08:52:36 +0000 |
| commit | f1a7977f92df4578891ea54b12a62d6054b16b55 (patch) | |
| tree | 67205b7b78aca192248970a0c6e9d041970ce2e6 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | 7430a9dae01f8d77a7fbbf163327ea65894cf8bb (diff) | |
Allow client certificates without openssl
We don't use OpenSSL, but only depended on it because QtNetwork didn't
define QSslCertificate without an SSL backend.
I changed that in QtNetwork 5.12, so we only rely on a QtNetwork SSL
backend with older Qt versions.
Task-number: QTBUG-54877
Change-Id: I16f3077235f5c48610597868608ef2e5ca2efa99
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index fbb7c1f9e..953cb4168 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1677,7 +1677,7 @@ void QWebEnginePagePrivate::allowCertificateError(const QSharedPointer<Certifica void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSelectController> &controller) { -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) Q_Q(QWebEnginePage); QWebEngineClientCertificateSelection certSelection(controller); @@ -1687,7 +1687,7 @@ void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSele #endif } -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) /*! \fn void QWebEnginePage::selectClientCertificate(QWebEngineClientCertificateSelection clientCertificateSelection) \since 5.12 |