diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-06 17:08:45 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-09-17 10:50:28 +0200 |
| commit | c9d97c73d7b1295b8c714ccaf1e5b717841bccc2 (patch) | |
| tree | 12d54ccaf91ca9f4e3d53c57ac05cab1f8f640e5 /chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc | |
| parent | 679147eead574d186ebf3069647b4c23e8ccace6 (diff) | |
| download | qtwebengine-chromium-c9d97c73d7b1295b8c714ccaf1e5b717841bccc2.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: Ie37d6cde263157e6717cc006a9896f0b9ebdaa5d
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/third_party/libjingle/source/talk/media/webrtc/webrtcvoiceengine.cc')
0 files changed, 0 insertions, 0 deletions