diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-12-16 10:40:46 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-16 10:49:02 +0100 |
commit | df8eff9b1e457fe0783cc6022bf7c21f5381afbb (patch) | |
tree | 62d282de99c1409d13612cf6ab85972188cb3409 /patches/patch-chromium.sh | |
parent | 0dd71c40535335affe93bbde0543b81be796f03e (diff) |
Revert "Update chromium patches to apply on current stable (1650)"
Let's make sure that the submodule integration succeeds first.
This reverts commit 6aa4bb60d7d10e50cb562756ef8210f559b35d1e.
Change-Id: I5c9b81654296b3a8a240118f9af222b12dd2ecc4
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'patches/patch-chromium.sh')
-rwxr-xr-x | patches/patch-chromium.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh index 9832b2024..3c593c741 100755 --- a/patches/patch-chromium.sh +++ b/patches/patch-chromium.sh @@ -75,6 +75,7 @@ cd $CHROMIUM_SRC_DIR/third_party/WebKit echo "Entering $PWD" git am $PATCH_DIR/0001-Remove-leftovers-from-WebKitSystemInterface.patch +git am $PATCH_DIR/0001-Do-not-include-Assertions.h-within-namespace-WebKit.patch cd $CHROMIUM_SRC_DIR/third_party/libjingle/source/talk echo "Entering $PWD" |