diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-18 15:40:56 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-01-19 23:13:47 +0100 |
| commit | a7510e85e6f53f4e889307edb58f26c8900d2d06 (patch) | |
| tree | d4b6208bb8bf7d8288c57d7024c2813b3af1b5aa /src/core/core_chromium.pri | |
| parent | 91696b2cb090e5b6147a30465f74d8d37db48615 (diff) | |
| parent | f1f763cf3c7254406b7b6f01551b6624210bb834 (diff) | |
Merge branch '5.15' into dev
Last commits before 87 update.
Change-Id: Id156b0199a8fd354c946cfe604ae8541ba554658
Diffstat (limited to 'src/core/core_chromium.pri')
| -rw-r--r-- | src/core/core_chromium.pri | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index f7ea8fcd1..63e9718e7 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -52,7 +52,6 @@ SOURCES = \ color_chooser_controller.cpp \ common/qt_ipc_logging.cpp \ common/qt_messages.cpp \ - common/user_script_data.cpp \ compositor/compositor.cpp \ compositor/content_gpu_client_qt.cpp \ compositor/display_overrides.cpp \ @@ -113,11 +112,11 @@ SOURCES = \ renderer/content_renderer_client_qt.cpp \ renderer/content_settings_observer_qt.cpp \ renderer/render_frame_observer_qt.cpp \ - renderer/render_view_observer_qt.cpp \ - renderer/render_thread_observer_qt.cpp \ + renderer/web_engine_page_render_frame.cpp \ + renderer/render_configuration.cpp \ renderer/user_resource_controller.cpp \ renderer/plugins/plugin_placeholder_qt.cpp \ - renderer_host/render_view_observer_host_qt.cpp \ + renderer_host/web_engine_page_host.cpp \ renderer_host/user_resource_controller_host.cpp \ resource_bundle_qt.cpp \ resource_context_qt.cpp \ @@ -156,7 +155,6 @@ HEADERS = \ color_chooser_controller_p.h \ color_chooser_controller.h \ common/qt_messages.h \ - common/user_script_data.h \ compositor/compositor.h \ compositor/content_gpu_client_qt.h \ compositor/display_software_output_surface.h \ @@ -220,11 +218,11 @@ HEADERS = \ renderer/content_renderer_client_qt.h \ renderer/content_settings_observer_qt.h \ renderer/render_frame_observer_qt.h \ - renderer/render_view_observer_qt.h \ - renderer/render_thread_observer_qt.h \ + renderer/web_engine_page_render_frame.h \ + renderer/render_configuration.h \ renderer/user_resource_controller.h \ renderer/plugins/plugin_placeholder_qt.h \ - renderer_host/render_view_observer_host_qt.h \ + renderer_host/web_engine_page_host.h \ renderer_host/user_resource_controller_host.h \ request_controller.h \ resource_context_qt.h \ |