summaryrefslogtreecommitdiffstats
path: root/patches/patch-chromium.sh
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-12-06 18:19:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-20 12:46:45 +0100
commitacefc4ef38759bea3ede377e21c38dc8e4046e9e (patch)
tree891a7200668b41b10f0704676815f5226d37b253 /patches/patch-chromium.sh
parentcc9c8e14d9a2aec6a746e889b8f597f7d89b303d (diff)
Update chromium patches to apply on current stable (1650)
Change-Id: I3bdad02a2ef69d242980e34774a8219ef0c74ea9 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches/patch-chromium.sh')
-rwxr-xr-xpatches/patch-chromium.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/patches/patch-chromium.sh b/patches/patch-chromium.sh
index 3c593c741..a048d2e7d 100755
--- a/patches/patch-chromium.sh
+++ b/patches/patch-chromium.sh
@@ -56,7 +56,6 @@ fi
cd $CHROMIUM_SRC_DIR
echo "Entering $PWD"
-git am $PATCH_DIR/0001-Export-ContentMainRunner.patch
git am $PATCH_DIR/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch
git am $PATCH_DIR/0001-Mac-Use-libc-instead-of-stdlibc.patch
git am $PATCH_DIR/0002-Clang-libc-does-not-support-incomplete-types-in-temp.patch
@@ -75,7 +74,6 @@ 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"