summaryrefslogtreecommitdiffstats
path: root/src/core/qtwebengine_extras.gypi
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-07-28 17:29:14 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-14 16:43:32 +0200
commitb1d423a3fc2cb3eeacc2a3e91ac9bdd2211c2613 (patch)
tree53f39e4e7c6a76d19a92fc23fde0728e6df95fc7 /src/core/qtwebengine_extras.gypi
parentf987b713b9f4e363056bf5174a762acb5b77ed79 (diff)
Update the QtWebEngineCore library to run on top of Chromium 37
Most of the patch is about upstream classes/methods that changed. Other important details: - icu data files are now used by default - cygwin is no longer required to build on Windows - RenderFrameHost has been replacing RenderViewHost in a few places, following the separate process iframes support in Chromium - The user agent is accessed through ContentClient::GetUserAgent instead of from the command line switches Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/qtwebengine_extras.gypi')
-rw-r--r--src/core/qtwebengine_extras.gypi28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index eafe5bc28..ab8af819d 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -6,20 +6,20 @@
'target_defaults': {
# patterns used to exclude chromium files from the build when we have a drop-in replacement
'sources/': [
- ['exclude', 'base/clipboard/clipboard_android.cc$'],
- ['exclude', 'base/clipboard/clipboard_aura.cc$'],
- ['exclude', 'base/clipboard/clipboard_aurax11.cc$'],
- ['exclude', 'base/clipboard/clipboard_gtk.cc$'],
- ['exclude', 'base/clipboard/clipboard_mac.mm$'],
- ['exclude', 'base/clipboard/clipboard_win.cc$'],
- ['exclude', 'base/clipboard/clipboard_util_win\\.(cc|h)$'],
- ['exclude', 'base/dragdrop/os_exchange_data_provider_aurax11\\.(cc|h)$'],
- ['exclude', 'base/dragdrop/os_exchange_data_provider_win\\.(cc|h)$'],
- ['exclude', 'base/resource/resource_bundle_android.cc$'],
- ['exclude', 'base/resource/resource_bundle_auralinux.cc$'],
- ['exclude', 'base/resource/resource_bundle_gtk.cc$'],
- ['exclude', 'base/resource/resource_bundle_mac.mm$'],
- ['exclude', 'base/resource/resource_bundle_win.cc$'],
+ ['exclude', 'clipboard/clipboard_android.cc$'],
+ ['exclude', 'clipboard/clipboard_aura.cc$'],
+ ['exclude', 'clipboard/clipboard_aurax11.cc$'],
+ ['exclude', 'clipboard/clipboard_gtk.cc$'],
+ ['exclude', 'clipboard/clipboard_mac.mm$'],
+ ['exclude', 'clipboard/clipboard_win.cc$'],
+ ['exclude', 'clipboard/clipboard_util_win\\.(cc|h)$'],
+ ['exclude', 'dragdrop/os_exchange_data_provider_aurax11\\.(cc|h)$'],
+ ['exclude', 'dragdrop/os_exchange_data_provider_win\\.(cc|h)$'],
+ ['exclude', 'resource/resource_bundle_android.cc$'],
+ ['exclude', 'resource/resource_bundle_auralinux.cc$'],
+ ['exclude', 'resource/resource_bundle_gtk.cc$'],
+ ['exclude', 'resource/resource_bundle_mac.mm$'],
+ ['exclude', 'resource/resource_bundle_win.cc$'],
['exclude', 'browser/web_contents/web_contents_view_android\\.(cc|h)$'],
['exclude', 'browser/web_contents/web_contents_view_aura\\.(cc|h)$'],
['exclude', 'browser/web_contents/web_contents_view_gtk\\.(cc|h)$'],