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/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.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/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch')
| -rw-r--r-- | patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch b/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch index 926f799f2..55cf5a5d5 100644 --- a/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch +++ b/patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch @@ -40,7 +40,7 @@ index 8b466bd..fe3f7b3 100644 } diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index cc664c6..f817cb2 100644 +index 1f5e836..2168769 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -48,6 +48,7 @@ class CryptoModuleBlockingPasswordDelegate; @@ -51,7 +51,7 @@ index cc664c6..f817cb2 100644 class ImageSkia; } -@@ -570,6 +571,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -563,6 +564,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Return NULL to use the default one for the platform to be created. virtual LocationProvider* OverrideSystemLocationProvider(); |