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/core/client_cert_select_controller.h | |
| 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/core/client_cert_select_controller.h')
| -rw-r--r-- | src/core/client_cert_select_controller.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/client_cert_select_controller.h b/src/core/client_cert_select_controller.h index 4a245c74c..46324ee90 100644 --- a/src/core/client_cert_select_controller.h +++ b/src/core/client_cert_select_controller.h @@ -55,7 +55,7 @@ #include <QtNetwork/qtnetwork-config.h> #include <QtCore/QUrl> -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) #include <QtCore/QVector> #include <QtNetwork/QSslCertificate> #endif @@ -80,12 +80,12 @@ public: ~ClientCertSelectController(); QUrl hostAndPort() const { return m_hostAndPort; } -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) void selectNone(); void select(const QSslCertificate &certificate); QVector<QSslCertificate> certificates() const; -#endif // QT_CONFIG(ssl) +#endif private: QUrl m_hostAndPort; |