1 files changed, 21 insertions, 13 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 836d30c0e..a846f2fbc 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -21,9 +21,13 @@ DEFINES += QT_NO_KEYWORDS \
            BUILDING_CHROMIUM
 
 # Ensure that response files, generated by qtbase/mkspecs/features/moc.prf, are found by moc.
-MOC_DIR = $$OUT_PWD/$$getConfigDir()/.moc
-RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc
-
+isUniversal() {
+   MOC_DIR = $$OUT_PWD/$$QT_ARCH/$$getConfigDir()/.moc
+   RCC_DIR = $$OUT_PWD/$$QT_ARCH/$$getConfigDir()/.rcc
+} else {
+   MOC_DIR = $$OUT_PWD/$$getConfigDir()/.moc
+   RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc
+}
 # Assume that we want mobile touch and low-end hardware behaviors
 # whenever we are cross compiling.
 qtConfig(webengine-embedded-build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
@@ -52,7 +56,6 @@ SOURCES = \
         color_chooser_controller.cpp \
         common/qt_ipc_logging.cpp \
         common/qt_messages.cpp \
-        common/user_script_data.cpp \
         compositor/content_gpu_client_qt.cpp \
         compositor/display_frame_sink.cpp \
         compositor/display_overrides.cpp \
@@ -111,11 +114,10 @@ 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 \
@@ -155,7 +157,6 @@ HEADERS = \
         color_chooser_controller_p.h \
         color_chooser_controller.h \
         common/qt_messages.h \
-        common/user_script_data.h \
         compositor/content_gpu_client_qt.h \
         compositor/display_frame_sink.h \
         compositor/display_software_output_surface.h \
@@ -217,11 +218,10 @@ 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 \
@@ -320,12 +320,16 @@ qtConfig(webengine-extensions) {
         common/extensions/extensions_api_provider_qt.cpp \
         common/extensions/extensions_client_qt.cpp \
         extensions/component_extension_resource_manager_qt.cpp \
+        extensions/extension_host_delegate_qt.cpp \
         extensions/extension_system_qt.cpp \
         extensions/extension_system_factory_qt.cpp \
         extensions/extension_web_contents_observer_qt.cpp \
         extensions/extensions_api_client_qt.cpp \
         extensions/extensions_browser_client_qt.cpp \
+        extensions/messaging_delegate_qt.cpp \
         extensions/mime_handler_view_guest_delegate_qt.cpp \
+        extensions/pdf_iframe_navigation_throttle_qt.cpp \
+        extensions/plugin_service_filter_qt.cpp \
         net/plugin_response_interceptor_url_loader_throttle.cpp \
         renderer/extensions/extensions_dispatcher_delegate_qt.cpp \
         renderer/extensions/extensions_renderer_client_qt.cpp \
@@ -336,12 +340,16 @@ qtConfig(webengine-extensions) {
         common/extensions/extensions_api_provider_qt.h \
         common/extensions/extensions_client_qt.h \
         extensions/component_extension_resource_manager_qt.h \
+        extensions/extension_host_delegate_qt.h \
         extensions/extension_system_qt.h \
         extensions/extension_system_factory_qt.h \
         extensions/extension_web_contents_observer_qt.h \
         extensions/extensions_api_client_qt.h \
         extensions/extensions_browser_client_qt.h \
+        extensions/messaging_delegate_qt.h \
         extensions/mime_handler_view_guest_delegate_qt.h \
+        extensions/pdf_iframe_navigation_throttle_qt.h \
+        extensions/plugin_service_filter_qt.h \
         net/plugin_response_interceptor_url_loader_throttle.h \
         renderer/extensions/extensions_dispatcher_delegate_qt.h \
         renderer/extensions/extensions_renderer_client_qt.h \