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/core/content_browser_client_qt.cpp | |
| 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/core/content_browser_client_qt.cpp')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index f47f85e93..16945020b 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -387,7 +387,7 @@ void ContentBrowserClientQt::AllowCertificateError(content::WebContents *webCont ssl_info, request_url, resource_type, - !IsCertErrorFatal(cert_error), + IsCertErrorFatal(cert_error), strict_enforcement, callback))); contentsDelegate->allowCertificateError(errorController); |