summaryrefslogtreecommitdiffstats
path: root/src/core/api/qwebenginecertificateerror.h
Commit message (Collapse)AuthorAgeFilesLines
* Bump copyrightsAllan Sandfeld Jensen2021-07-231-1/+1
| | | | | | | Change-Id: I8eb8bfba45abb340816b8c2072cca4486c1f37ab Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 802eb3afed55faf390fc8ed9dd78ff073e366267) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix Qt include conventions in public headersFriedemann Kleint2021-07-091-1/+1
| | | | | | | | | Specify the module and use the .h files. Change-Id: I7c2bb1a635d10e25c874f18736120efde6ce2ca4 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 3b363345a3e75eb10827f67b995ae9472a6d0e8e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2020-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* Remove duplicated enums for certificate errorsMichal Klocek2020-08-281-1/+2
| | | | | | | Add missing CertificateSymantecLegacy. Change-Id: I395f0c4a8c69fe3e0c303a13a3cbc077c123d26d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Improve QWebEngineCertificateError apiMichal Klocek2020-08-281-12/+7
| | | | | | | | | | | | | | | | | | | | | | * remove const ref from QWebEngineCertificateError Q_GADGET is a value type, QWebEngineCertificateError is pass as const reference from api. This is not so useful since, in qml this will be anyway copied and for c++ this is not useful since reject, ignore, defer methods are all const. Therefore simply pass it by value. * make consistent naming defer(), acceptCertificate(), rejectCertificate() * remove properties 'differed', 'answered' which are use internally, user knows if he calls functions. * error.errorDescription -> error.description() * error.error() -> error.type() [ChangeLog] In QWebEngineCertificateError use acceptCertificate() instead of ignoreCertificiateError() Change-Id: I9ffa500a0a455d98445b066252dd283872740731 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Cleanup namespace issues in coreMichal Klocek2020-08-141-4/+4
| | | | | Change-Id: Ifdffc556278fa5d133da1896600a71248662e9fa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Simplify WebEngineCertificateErrorMichal Klocek2020-08-141-2/+5
| | | | | | | | Removes certificateErrorControllerPrivate, moves error handling logic to core. Change-Id: I050f73f1e37eb9ae39ad471fe1673d2b6140cf89 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Move QWebEngineCertificateError to core and use it in QMLJüri Valdmann2020-08-141-0/+113
Update qml certificate error test. Task-number: QTBUG-74585 Change-Id: I9383052bd1e37160d03e3d66e8f2e4a749023736 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>