diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 09:51:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 09:51:46 +0200 |
| commit | 9f6efd1ee439ae733f463ef42adb8035ea12510f (patch) | |
| tree | c69d842f2458668da893f8ab8d3f18c2bef8eff1 /src/webenginewidgets | |
| parent | 2f72083601fb6a4fcc66b6440222291fc334cb3f (diff) | |
| parent | 99b27e9654bcaf6af0719e33989ba0c956af1c3c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty
Change-Id: Ib1202bcce587f9614013105c6a836344c1727cb7
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 8451bab1a..7b66ac876 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1729,11 +1729,9 @@ void QWebEnginePagePrivate::allowCertificateError(const QSharedPointer<Certifica Q_Q(QWebEnginePage); bool accepted = false; - QWebEngineCertificateError error(controller->error(), controller->url(), controller->overridable() && !controller->strictEnforcement(), controller->errorString()); + QWebEngineCertificateError error(controller->error(), controller->url(), controller->overridable(), controller->errorString()); accepted = q->certificateError(error); - - if (error.isOverridable()) - controller->accept(accepted); + controller->accept(error.isOverridable() && accepted); } void QWebEnginePagePrivate::selectClientCert(const QSharedPointer<ClientCertSelectController> &controller) |