path: root/
diff options
authorAndras Becsi <>2014-05-22 20:33:17 +0200
committerThe Qt Project <>2014-06-05 00:23:00 +0200
commitde850d71e4101249931de42670154eba2517c530 (patch)
tree286b6e4777122b88ffda0ca55b951d26b073291a /
parentebdca4992f35560c3cea40b87e0fe2360943a427 (diff)
Add --baseline-upstream option to
This flag makes it possible to initialize an upstream repository without applying the QtWebEngine patches, which will be the used to take a new snapshot, on top of which we will rebase our patches. Change-Id: I89a6a135bb457edfc31c24a052f1732fb70299dc Reviewed-by: Andras Becsi <>
Diffstat (limited to '')
1 files changed, 6 insertions, 1 deletions
diff --git a/ b/
index b2a2d208f..7870515e3 100755
--- a/
+++ b/
@@ -76,11 +76,15 @@ use_external_chromium = False
parser = argparse.ArgumentParser(description='Initialize QtWebEngine repository.')
parser.add_argument('--no-gerrit', action='store_true', help='skip adding the upstream Gerrit remote and commit hook')
+parser.add_argument('--baseline-upstream', action='store_true', help='initialize using upstream Chromium submodule w/o applying patches (for maintenance purposes only)')
group = parser.add_mutually_exclusive_group()
group.add_argument('-u', '--upstream', action='store_true', help='initialize using upstream Chromium submodule')
group.add_argument('-s', '--snapshot', action='store_true', help='initialize using flat Chromium snapshot submodule (default)')
args = parser.parse_args()
+if args.baseline_upstream:
+ args.upstream = True
if chromium_src:
chromium_src = os.path.abspath(chromium_src)
use_external_chromium = True
@@ -180,6 +184,7 @@['git', 'update-index', '--assume-unchanged', '.gitmodules'])
if args.upstream:
- applyPatches()
+ if not args.baseline_upstream:
+ applyPatches()
if args.snapshot: