diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-12-06 18:19:58 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-13 13:46:31 +0100 |
| commit | 6aa4bb60d7d10e50cb562756ef8210f559b35d1e (patch) | |
| tree | 9ea64e167416ce6975dd957a56ed8b0e0ace2154 /patches/0001-Add-seams-to-setup-GL-contexts-sharing-with-QtQuick.patch | |
| parent | b6b03a8316cb1777efb05cd851ca0cb3b989597a (diff) | |
Update chromium patches to apply on current stable (1650)
Change-Id: I3cd2ddc401e67c232c4bcc88d3c20252eece6be3
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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 55cf5a5d5..926f799f2 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 1f5e836..2168769 100644 +index cc664c6..f817cb2 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 1f5e836..2168769 100644 class ImageSkia; } -@@ -563,6 +564,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -570,6 +571,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Return NULL to use the default one for the platform to be created. virtual LocationProvider* OverrideSystemLocationProvider(); |