diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-28 17:29:14 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:32 +0200 |
| commit | b1d423a3fc2cb3eeacc2a3e91ac9bdd2211c2613 (patch) | |
| tree | 53f39e4e7c6a76d19a92fc23fde0728e6df95fc7 /src/core/qtwebengine.gypi | |
| parent | f987b713b9f4e363056bf5174a762acb5b77ed79 (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.gypi')
| -rw-r--r-- | src/core/qtwebengine.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index f4482a858..ba08c72c1 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -3,7 +3,7 @@ # information so that qmake can take care of the deployment. 'let_qmake_do_the_linking': 1, 'variables': { - 'version_script_location%': '<(chromium_src_dir)/chrome/tools/build/version.py', + 'version_script_location%': '<(chromium_src_dir)/build/util/version.py', }, 'dependencies': [ '<(chromium_src_dir)/base/base.gyp:base', @@ -24,12 +24,12 @@ '<(chromium_src_dir)/net/net.gyp:net', '<(chromium_src_dir)/net/net.gyp:net_resources', '<(chromium_src_dir)/skia/skia.gyp:skia', - '<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:webkit', + '<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:blink_web', + '<(chromium_src_dir)/ui/base/ui_base.gyp:ui_base', '<(chromium_src_dir)/ui/gl/gl.gyp:gl', - '<(chromium_src_dir)/ui/ui.gyp:ui', '<(chromium_src_dir)/url/url.gyp:url_lib', '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', - '<(chromium_src_dir)/webkit/glue/webkit_glue.gyp:*', + 'chrome_qt.gyp:chrome_qt', ], 'include_dirs': [ |