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/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch | |
| 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/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch')
| -rw-r--r-- | patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch b/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch index fba13a90a..b2998b8b6 100644 --- a/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch +++ b/patches/0002-Add-WebEngineContext-to-RunLoop-s-friends.patch @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] Add WebEngineContext to RunLoop's friends. 1 file changed, 3 insertions(+) diff --git a/base/run_loop.h b/base/run_loop.h -index f5ee5c3..b167907 100644 +index 380c8bf..12f810a 100644 --- a/base/run_loop.h +++ b/base/run_loop.h @@ -10,6 +10,8 @@ @@ -20,7 +20,7 @@ index f5ee5c3..b167907 100644 namespace base { #if defined(OS_ANDROID) class MessagePumpForUI; -@@ -76,6 +78,7 @@ class BASE_EXPORT RunLoop { +@@ -74,6 +76,7 @@ class BASE_EXPORT RunLoop { private: friend class MessageLoop; @@ -29,5 +29,5 @@ index f5ee5c3..b167907 100644 // Android doesn't support the blocking MessageLoop::Run, so it calls // BeforeRun and AfterRun directly. -- -1.8.4.2 +1.8.3 |