From 1cd5d7bd3c922e3162d7c70a6a9cfc43d9fa9564 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 29 May 2019 13:06:38 +0200 Subject: Fix our fake project Since we use our configuration in core_common.pri, we should include it there to ensure we don't miss it somewhere. Task-number: QTCREATORBUG-22315 Change-Id: I9c35dd850d76486e7c787613e7508c03d6f42b2b Reviewed-by: Christian Kandeler Reviewed-by: Michal Klocek --- src/core/core_chromium.pri | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/core/core_chromium.pri') diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index d8ef25d8c..35d677770 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -1,10 +1,5 @@ -include($$QTWEBENGINE_OUT_ROOT/src/core/qtwebenginecore-config.pri) -QT_FOR_CONFIG += webenginecore webenginecore-private - qtConfig(debug_and_release): CONFIG += debug_and_release -include(core_common.pri) - macos { # This fixes namespace builds on macOS. Specifically namespace ambiguity issues between Qt and # Chromium forward declarations of NSString. -- cgit v1.2.3 From 4ea3855b7fc5c61c630879aef7081049c0399da4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 17 May 2019 18:25:13 +0200 Subject: Pass isIncognito to render process MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Uses the RenderThreadObserver pattern Chrome uses. Change-Id: Ieafff311ef5e31f67070517b2de49ad94a7bd674 Reviewed-by: Michael Brüning --- src/core/core_chromium.pri | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/core_chromium.pri') diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 35d677770..5d55f35a2 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -111,6 +111,7 @@ SOURCES = \ 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/user_resource_controller.cpp \ renderer_host/render_view_observer_host_qt.cpp \ renderer_host/user_resource_controller_host.cpp \ @@ -218,6 +219,7 @@ HEADERS = \ 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/user_resource_controller.h \ renderer_host/render_view_observer_host_qt.h \ renderer_host/user_resource_controller_host.h \ -- cgit v1.2.3