diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:19:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:33:45 +0200 |
| commit | d7b198605de9979b7875c2da20dea5e4657deb17 (patch) | |
| tree | 7374f5b42572027f09c54e08b32ee3aac0bed4b8 /src/client/qwaylandbuffer_p.h | |
| parent | e4a4a6dd7503f069efbae81c0587f6d8fe3cee99 (diff) | |
| parent | d5e7965a87d81e2d7157c785403b0aba681de62a (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/client/qwaylandshmbackingstore.cpp
src/client/qwaylandwindow.cpp
Change-Id: I795fd08f0fc5d3cb5ed55bf16e724f66b7567723
Diffstat (limited to 'src/client/qwaylandbuffer_p.h')
| -rw-r--r-- | src/client/qwaylandbuffer_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/qwaylandbuffer_p.h b/src/client/qwaylandbuffer_p.h index 6fff45014..e1a891d12 100644 --- a/src/client/qwaylandbuffer_p.h +++ b/src/client/qwaylandbuffer_p.h @@ -48,7 +48,10 @@ namespace QtWaylandClient { class Q_WAYLAND_CLIENT_EXPORT QWaylandBuffer { public: - QWaylandBuffer() { } + QWaylandBuffer() + : mBuffer(0) + { + } virtual ~QWaylandBuffer() { } wl_buffer *buffer() {return mBuffer;} virtual QSize size() const = 0; |