diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-05 17:09:46 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-11-05 17:09:46 +0100 |
commit | 79f5361400fa91b30cc4a1b34335b49284ba3e07 (patch) | |
tree | 3c5f79b230ff4c83b441cba5df7da357bc9c4f2e /src/core/client_cert_select_controller.cpp | |
parent | bc1529f56b8c86259c7f952b0ea9b439f5cc8d53 (diff) | |
parent | 34b714122051eae86ac49fd95c7015fb081f79eb (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/core/render_widget_host_view_qt.cpp
src/core/web_contents_adapter_client.h
src/webenginewidgets/api/qwebenginepage_p.h
Change-Id: Ibd011c40839c09469218ac4c71a13d0a0b1c9778
Diffstat (limited to 'src/core/client_cert_select_controller.cpp')
-rw-r--r-- | src/core/client_cert_select_controller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/client_cert_select_controller.cpp b/src/core/client_cert_select_controller.cpp index 1362322f7..7d08d57c1 100644 --- a/src/core/client_cert_select_controller.cpp +++ b/src/core/client_cert_select_controller.cpp @@ -71,7 +71,7 @@ ClientCertSelectController::~ClientCertSelectController() m_delegate->ContinueWithCertificate(nullptr, nullptr); } -#if QT_CONFIG(ssl) +#if !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) void ClientCertSelectController::selectNone() { @@ -118,6 +118,6 @@ QVector<QSslCertificate> ClientCertSelectController::certificates() const return out; } -#endif // QT_CONFIG(ssl) +#endif // !defined(QT_NO_SSL) || QT_VERSION >= QT_VERSION_CHECK(5, 12, 0) QT_END_NAMESPACE |