summaryrefslogtreecommitdiffstats
path: root/tools/scripts/version_resolver.py
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-05-22 20:42:02 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 00:23:00 +0200
commit45c0bba8a40bb87a386fad02ca51371a44f475ba (patch)
tree985f5f885f6aa7aeea8618b8ac3dbd5186ff1fd7 /tools/scripts/version_resolver.py
parentde850d71e4101249931de42670154eba2517c530 (diff)
Update ninja and bump Chromium version to 33.0.1750.170
This patch also changes the way we handle our patches. We'll always take a new snapshot without patching Chromium and rebase our patches on top of the snapshot. This removes the need for separate patch files for the ustream repository since we can use the patches of the snapshot and apply them on the upstream checkout if we want to use an upstream build. This makes it easier for us to have branches for the release and maintain and minimize the number of patches we need on top of upstream Chromium. For now a snapshot checkout is needed to be able to prepare the patches for an upstream build but in future we cold improve this to fetch the patches from the remote snapshot repository if needed. Change-Id: I6280ffbe2d50d25d252734bc76d19bfaaa081637 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'tools/scripts/version_resolver.py')
-rw-r--r--tools/scripts/version_resolver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 5c625472..738798e4 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -48,7 +48,7 @@ import json
import urllib2
import git_submodule as GitSubmodule
-chromium_version = '33.0.1750.149'
+chromium_version = '33.0.1750.170'
chromium_branch = '1750'
json_url = 'http://omahaproxy.appspot.com/all.json'