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:52:38 +0200 |
commit | fdc06601fb120d03b6a17a42805f75f760025011 (patch) | |
tree | c69d842f2458668da893f8ab8d3f18c2bef8eff1 /src/webengine/api/qquickwebengineview.cpp | |
parent | 2f72083601fb6a4fcc66b6440222291fc334cb3f (diff) | |
parent | 9f6efd1ee439ae733f463ef42adb8035ea12510f (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 906eb4b75..fca69121a 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -296,7 +296,7 @@ void QQuickWebEngineViewPrivate::allowCertificateError(const QSharedPointer<Cert // mark the object for gc by creating temporary jsvalue qmlEngine(q)->newQObject(quickController); Q_EMIT q->certificateError(quickController); - if (!quickController->deferred() && !quickController->answered()) + if (!quickController->overridable() || (!quickController->deferred() && !quickController->answered())) quickController->rejectCertificate(); else m_certificateErrorControllers.append(errorController); |