projects
/
profile
/
ivi
/
qtwayland.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6d55c22
)
include file fix for wayland
author
Paul Olav Tvete
<paul.tvete@nokia.com>
Fri, 29 Apr 2011 11:04:43 +0000
(13:04 +0200)
committer
Paul Olav Tvete
<paul.tvete@nokia.com>
Fri, 29 Apr 2011 14:30:12 +0000
(16:30 +0200)
src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
patch
|
blob
|
history
src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
patch
|
blob
|
history
src/plugins/platforms/wayland/qwaylandbuffer.h
patch
|
blob
|
history
diff --git
a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
index
4b0d3a0
..
81c1805
100644
(file)
--- a/
src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
+++ b/
src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.cpp
@@
-42,6
+42,7
@@
#include "qwaylandxcompositebuffer.h"
#include "wayland-client.h"
+#include "wayland-xcomposite-client-protocol.h"
QWaylandXCompositeBuffer::QWaylandXCompositeBuffer(wl_xcomposite *xcomposite, uint32_t window, const QSize &size, wl_visual *visual)
:mSize(size)
diff --git
a/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
b/src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
index
b346651
..
c51f6bb
100644
(file)
--- a/
src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
+++ b/
src/plugins/platforms/wayland/gl_integration/xcomposite_share/qwaylandxcompositebuffer.h
@@
-43,8
+43,10
@@
#define QWAYLANDXCOMPOSITEBUFFER_H
#include "qwaylandbuffer.h"
+#include <stdint.h>
-#include "wayland-xcomposite-client-protocol.h"
+struct wl_xcomposite;
+struct wl_visual;
class QWaylandXCompositeBuffer : public QWaylandBuffer
{
diff --git
a/src/plugins/platforms/wayland/qwaylandbuffer.h
b/src/plugins/platforms/wayland/qwaylandbuffer.h
index
8779d5f
..
e97a07b
100644
(file)
--- a/
src/plugins/platforms/wayland/qwaylandbuffer.h
+++ b/
src/plugins/platforms/wayland/qwaylandbuffer.h
@@
-44,7
+44,7
@@
#include <QtCore/QSize>
-#include <wayland-client-protocol.h>
+struct wl_buffer;
class QWaylandBuffer {
public: