diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-05-22 20:43:17 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-05 00:23:00 +0200 |
| commit | 4f195e3b634b2cb96e6f74d8b9d90f77a44830f5 (patch) | |
| tree | 4c82d144e5b384045bdc32ca2adee82684377a9d /patches/chromium/0004-Do-not-modify-the-child-path.patch | |
| parent | 45c0bba8a40bb87a386fad02ca51371a44f475ba (diff) | |
Remove separately maintained patches from repository
We maintain them on top of the Chromium snapshot.
A new script tools/scripts/patch_upstream.py replaced
patches/patch-chromium.sh with the recent snapshot update.
The patches that we have on top of the baseline version
are prepared from the chromium snapshot and applied on
the upstream chromium checkout.
A consequence of this is that init-repository.py -u
from now on requires a snapshot checkout as well.
Change-Id: I639c45904b72952804e5227ebc948a8859cf74dd
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches/chromium/0004-Do-not-modify-the-child-path.patch')
| -rw-r--r-- | patches/chromium/0004-Do-not-modify-the-child-path.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/patches/chromium/0004-Do-not-modify-the-child-path.patch b/patches/chromium/0004-Do-not-modify-the-child-path.patch deleted file mode 100644 index b6f598204..000000000 --- a/patches/chromium/0004-Do-not-modify-the-child-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Zeno Albisser <zeno.albisser@digia.com> -Date: Sat, 29 Jun 2013 22:39:29 +0200 -Subject: Do not modify the child path. - -We currently only have a single process binary for Qt. -Therefore we should not choose a different binary based on required privileges. -However, this patch can only be a preliminary solution. -May be we should instead implement our own ChildProcessHost. ---- - content/common/child_process_host_impl.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc -index 1467536..2607496 100644 ---- a/content/common/child_process_host_impl.cc -+++ b/content/common/child_process_host_impl.cc -@@ -107,7 +107,7 @@ base::FilePath ChildProcessHost::GetChildPath(int flags) { - if (child_path.empty()) - PathService::Get(CHILD_PROCESS_EXE, &child_path); - --#if defined(OS_MACOSX) -+#if defined(OS_MACOSX) && 0 - DCHECK(!(flags & CHILD_NO_PIE && flags & CHILD_ALLOW_HEAP_EXECUTION)); - - // If needed, choose an executable with special flags set that inform the |