diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:14:47 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:14:47 +0100 |
| commit | 573d0ee5ba86d99095f217ea9e19172bfc5e75fd (patch) | |
| tree | 81a3f21339610101706f86a3038bae00bad55eef /src/compositor/wayland_wrapper/qwlsurface.cpp | |
| parent | 6d038fb664de833725d13ee6b548d85eabf1ff3a (diff) | |
| parent | aaa81b2bb5eb3b18cb80c71c6730db227f31825f (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Conflicts:
src/compositor/wayland_wrapper/qwlsurface.cpp
Change-Id: I3b6a4af41f272d3dc7fc920ba2542f2dd7978175
Diffstat (limited to 'src/compositor/wayland_wrapper/qwlsurface.cpp')
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlsurface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/compositor/wayland_wrapper/qwlsurface.cpp b/src/compositor/wayland_wrapper/qwlsurface.cpp index 1d01667b3..79b83ab7e 100644 --- a/src/compositor/wayland_wrapper/qwlsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlsurface.cpp @@ -59,7 +59,7 @@ #include <wayland-server.h> #ifdef QT_COMPOSITOR_WAYLAND_GL -#include "hardware_integration/qwaylandclientbufferintegration.h" +#include "hardware_integration/qwlclientbufferintegration_p.h" #include <qpa/qplatformopenglcontext.h> #endif @@ -175,7 +175,7 @@ bool Surface::isYInverted() const { bool ret = false; static bool negateReturn = qgetenv("QT_COMPOSITOR_NEGATE_INVERTED_Y").toInt(); - QWaylandClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration(); + ClientBufferIntegration *clientBufferIntegration = m_compositor->clientBufferIntegration(); #ifdef QT_COMPOSITOR_WAYLAND_GL SurfaceBuffer *surfacebuffer = currentSurfaceBuffer(); @@ -193,7 +193,7 @@ bool Surface::isYInverted() const bool Surface::visible() const { SurfaceBuffer *surfacebuffer = currentSurfaceBuffer(); - return surfacebuffer ? surfacebuffer->waylandBufferHandle() : 0; + return surfacebuffer ? bool(surfacebuffer->waylandBufferHandle()) : false; } QPointF Surface::pos() const @@ -479,7 +479,7 @@ void Surface::surface_damage(Resource *, int32_t x, int32_t y, int32_t width, in void Surface::surface_frame(Resource *resource, uint32_t callback) { - struct wl_resource *frame_callback = wl_client_add_object(resource->client(), &wl_callback_interface, 0, callback, this); + struct wl_resource *frame_callback = wl_resource_create(resource->client(), &wl_callback_interface, wl_callback_interface.version, callback); m_pendingFrameCallbacks << new FrameCallback(this, frame_callback); } |