diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-11-05 18:55:49 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-05 17:04:01 +0100 |
| commit | 5cb352ffd7c013a1d8ea24107df0c7f1d13fa245 (patch) | |
| tree | 8e0ea476a436ea98941dc984a7c37839aa50861e /chromium/gpu | |
| parent | 6d6217cd83b8732eb32a7721c068d8f40048c848 (diff) | |
| download | qtwebengine-chromium-5cb352ffd7c013a1d8ea24107df0c7f1d13fa245.tar.gz | |
Solve conflicts when including both QtOpenGL headers and resource_provider.h
If resource_provider.h is going to be used to integrate delegated frame
to external compositors, it should avoid conflicting with the system's
gl.h.
Change-Id: Ie37d6cde263157e6717cc006a0896f0b9ebdaa5d
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/gpu')
| -rw-r--r-- | chromium/gpu/command_buffer/client/share_group.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/gpu/command_buffer/client/share_group.h b/chromium/gpu/command_buffer/client/share_group.h index fe37ddaff32..7066bb5fd7c 100644 --- a/chromium/gpu/command_buffer/client/share_group.h +++ b/chromium/gpu/command_buffer/client/share_group.h @@ -5,7 +5,6 @@ #ifndef GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ #define GPU_COMMAND_BUFFER_CLIENT_SHARE_GROUP_H_ -#include <GLES2/gl2.h> #include <stdint.h> #include <memory> |