diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-19 11:42:25 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-22 17:06:43 +0200 |
commit | 34cd9bb6006b854ef8029448be10822b14a2b7ac (patch) | |
tree | 2d04302f7d5c71b13ef73fc419937047b3a0f218 /src/core/core_chromium.pri | |
parent | 404201b9a41564512937a7d96e55d6b095bdcab0 (diff) | |
parent | 6fffee8bfb270eda4f06fa5dbe3a4b190036e90a (diff) |
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
f7a2f8153c82 Fix hunspell::NodeReader::affix_id_for_leaf bounds check
1e80090f7044 Fix resolve_proxy service permissions
2e498629651d Add proxy_resolver_manifest
Change-Id: I2b176c80aa315a0ae0a22b5707694fdcd407407b
Diffstat (limited to 'src/core/core_chromium.pri')
-rw-r--r-- | src/core/core_chromium.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 92fefe533..b4d1f2b8e 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -58,6 +58,7 @@ SOURCES = \ content_client_qt.cpp \ content_browser_client_qt.cpp \ content_main_delegate_qt.cpp \ + content_utility_client_qt.cpp \ delegated_frame_node.cpp \ desktop_screen_qt.cpp \ devtools_frontend_qt.cpp \ @@ -145,6 +146,7 @@ HEADERS = \ content_client_qt.h \ content_browser_client_qt.h \ content_main_delegate_qt.h \ + content_utility_client_qt.h \ delegated_frame_node.h \ desktop_screen_qt.h \ devtools_frontend_qt.h \ |