diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-25 14:55:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 17:20:36 +0100 |
| commit | 25ff83bc7b3e921aa540b88f6c848a78ee7d461f (patch) | |
| tree | 4a455f2410e5e1c0cbdfd91a4dce40c75532c9f0 /patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch | |
| parent | 175dba21885a5bcbd031c1cbc394825b5fbb783e (diff) | |
| download | qtwebengine-25ff83bc7b3e921aa540b88f6c848a78ee7d461f.tar.gz | |
Update patches to stable branch 1750
Change-Id: I85149bf4405420813d07bee5259f11a192e86a73
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Diffstat (limited to 'patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch')
| -rw-r--r-- | patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch b/patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch new file mode 100644 index 000000000..e2796a22f --- /dev/null +++ b/patches/chromium/third_party/WebKit/0003-Add-missing-dependency-to-khronos_headers.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Andras Becsi <andras.becsi@digia.com> +Date: Thu, 13 Mar 2014 16:11:59 +0100 +Subject: Add missing dependency to khronos_headers + +This is needed since https://codereview.chromium.org/106503003 +and because of our chromium patch that fixes the build with a +GL ES2 configured Qt. +--- + Source/core/core.gyp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Source/core/core.gyp b/Source/core/core.gyp +index 882565d..8b8a8b5 100644 +--- a/Source/core/core.gyp ++++ b/Source/core/core.gyp +@@ -821,6 +821,7 @@ + 'webcore_derived', + '../wtf/wtf.gyp:wtf', + '<(DEPTH)/skia/skia.gyp:skia', ++ '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', + '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', + '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', + '<(DEPTH)/url/url.gyp:url_lib', +@@ -830,6 +831,7 @@ + '../wtf/wtf.gyp:wtf', + 'webcore_derived', + '<(DEPTH)/skia/skia.gyp:skia', ++ '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers', + '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', + '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', + '<(DEPTH)/url/url.gyp:url_lib', |