diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-14 10:07:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-09-14 18:54:49 +0200 |
| commit | a3c77682ce67420ac3fba4d81847bbe170b387eb (patch) | |
| tree | c22938dae751405e5f78881a7683ab3176c77a5c /tests/auto/quick/publicapi/tst_publicapi.cpp | |
| parent | d3882688a8fd70ccd4c42afd2485c3b5d3810547 (diff) | |
| parent | 1c6d01b846f2152e7215c98cfa09e668c880da7e (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/3rdparty
src/core/certificate_error_controller.cpp
src/core/certificate_error_controller.h
src/core/compositor/compositor.cpp
src/core/compositor/compositor.h
src/core/compositor/display_gl_output_surface.cpp
src/core/content_browser_client_qt.cpp
src/core/core_chromium.pri
src/core/delegated_frame_host_client_qt.cpp
src/core/ozone/gl_share_context_qt.h
src/core/ozone/surface_factory_qt.cpp
src/core/permission_manager_qt.cpp
src/core/render_widget_host_view_qt.cpp
src/core/render_widget_host_view_qt.h
src/core/web_engine_context.cpp
src/core/web_engine_settings.cpp
src/core/web_event_factory.cpp
tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp
Change-Id: Ice14c3c350b139e800c7c7011b7cef1fc7010669
Diffstat (limited to 'tests/auto/quick/publicapi/tst_publicapi.cpp')
| -rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index fd55fcf20..29b4eedb6 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -137,6 +137,7 @@ static const QStringList expectedAPI = QStringList() << "QWebEngineCertificateError.CertificateWeakKey --> Type" << "QWebEngineCertificateError.CertificateWeakSignatureAlgorithm --> Type" << "QWebEngineCertificateError.CertificateSymantecLegacy --> Type" + << "QWebEngineCertificateError.SslObsoleteVersion --> Type" << "QWebEngineCertificateError.SslPinnedKeyNotInCertificateChain --> Type" << "QWebEngineCertificateError.defer() --> void" << "QWebEngineCertificateError.description --> QString" |