diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-06 09:47:16 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-07-06 18:05:30 +0000 |
| commit | 9b70ebd22d58a89ca605f1f7ea602148b183055f (patch) | |
| tree | 99b9a60962387bff36325fcd5f5df2a9532e11cc /tools/scripts/version_resolver.py | |
| parent | 0cc881b5bf8a4a6da8277d5166da92a1675f4654 (diff) | |
| parent | b3f7d3a62e00e611e8d7f592ae048a9536b635c6 (diff) | |
| download | qtwebengine-9b70ebd22d58a89ca605f1f7ea602148b183055f.tar.gz | |
Merge "Merge Chromium 44 and fixes" into refs/staging/dev
Diffstat (limited to 'tools/scripts/version_resolver.py')
| -rw-r--r-- | tools/scripts/version_resolver.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py index 419fb72d1..572c3dcba 100644 --- a/tools/scripts/version_resolver.py +++ b/tools/scripts/version_resolver.py @@ -51,8 +51,8 @@ import json import urllib2 import git_submodule as GitSubmodule -chromium_version = '40.0.2214.115' -chromium_branch = '2214' +chromium_version = '44.0.2403.47' +chromium_branch = '2403' ninja_version = 'v1.5.3' json_url = 'http://omahaproxy.appspot.com/all.json' @@ -64,6 +64,7 @@ upstream_src_dir = os.path.abspath(snapshot_src_dir + '_upstream') submodule_blacklist = [ 'third_party/WebKit/LayoutTests/w3c/csswg-test' , 'third_party/WebKit/LayoutTests/w3c/web-platform-tests' + , 'third_party/jsoncpp/source' , 'chrome/tools/test/reference_build/chrome_mac' , 'chrome/tools/test/reference_build/chrome_linux' , 'chrome/tools/test/reference_build/chrome_win' |