diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-02 12:43:52 +0200 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-07-02 12:43:52 +0200 |
| commit | 57119f16668cf79dec0dbdfbc9a2183f9e5c44fa (patch) | |
| tree | a9f6c7ec75d91eb8408d02dd2c16eec4a39e0541 /src/core/core_chromium.pri | |
| parent | fb430b4e104dd6313a776980b4798f1333193149 (diff) | |
| parent | bd864f6418ed164c19a700fc4b6ebab3be431c62 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I806417dd7a6d2594a86ee49feedc4ad9ee48add2
Diffstat (limited to 'src/core/core_chromium.pri')
| -rw-r--r-- | src/core/core_chromium.pri | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index 69a7f48d8..f99513adf 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. @@ -117,6 +112,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 \ @@ -225,6 +221,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 \ |