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-Fix-the-build-with-a-GL-ES2-configured-Qt.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-Fix-the-build-with-a-GL-ES2-configured-Qt.patch')
-rw-r--r-- | patches/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch b/patches/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch index 03b50e1e0..cb0652f87 100644 --- a/patches/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch +++ b/patches/0001-Fix-the-build-with-a-GL-ES2-configured-Qt.patch @@ -29,10 +29,10 @@ Change-Id: Id4d98fe22ef8b778b5ba8da300dad28e69507732 6 files changed, 29 insertions(+), 1 deletion(-) diff --git a/content/content_browser.gypi b/content/content_browser.gypi -index c2e5f18..f820ad0 100644 +index 22d857a..8a37d91 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi -@@ -1270,6 +1270,7 @@ +@@ -1234,6 +1234,7 @@ 'dependencies': [ 'browser/devtools/devtools_resources.gyp:devtools_resources', '../cc/cc.gyp:cc', @@ -55,7 +55,7 @@ index b4d5b78..75bea79 100644 'command_buffer/client/atomicops.cc', 'command_buffer/client/atomicops.h', diff --git a/gpu/command_buffer_common.gypi b/gpu/command_buffer_common.gypi -index 55e825e..4c1044a 100644 +index 85431e4..f159355 100644 --- a/gpu/command_buffer_common.gypi +++ b/gpu/command_buffer_common.gypi @@ -6,6 +6,9 @@ @@ -146,10 +146,10 @@ index 8a85572..88130d2 100644 '.', '../../gpu', # Contains GLES2/gl2chromium.h diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp -index 2831446..be79c22 100644 +index 5390c9a..effc5b7 100644 --- a/webkit/common/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp -@@ -27,6 +27,9 @@ +@@ -26,6 +26,9 @@ '<(DEPTH)/ui/gl/gl.gyp:gl', '<(DEPTH)/ui/ui.gyp:ui', ], @@ -160,5 +160,5 @@ index 2831446..be79c22 100644 # This list contains all .h and .cc in gpu except for test code. 'context_provider_in_process.cc', -- -1.8.4.2 +1.8.4 |