Commit 34cd9bb6 authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

Merge remote-tracking branch 'origin/5.11' into 5.12

Conflicts:
	configure.json
	src/3rdparty
	src/core/content_browser_client_qt.cpp
	src/core/content_browser_client_qt.h
	src/core/login_delegate_qt.cpp
	src/core/login_delegate_qt.h
	src/core/net/url_request_context_getter_qt.cpp
	src/core/net/url_request_context_getter_qt.h
	src/core/qtwebengine.gni

3rdparty changes:
        616a7f558c7e This is expected for us, so don't report it as an error.
        c30febceaa1b Do not write <protocol>.json to source directory
        9e68e4f2d92c Remove incomplete logic to detect AMD K2 CPU's
        e0ed41c8e90a FIXUP: This is expected for us, so don't report it as an error.
        f9fd9109b4b7 Fix --single-process --disable-gpu combination not to hit asserts
        f305d65cc27e Reduce severity level of messages when kDisableGpu switch is used
        5e3e5074bb78 Work around MSVC2017 optimizer bug when printing a page usind Pdfium
        34f52ec3bae8 Bump maximum number of custom isolated world ids
        f7a2...
parents 404201b9 6fffee8b
Showing with 418 additions and 8 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment