diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-31 12:19:02 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-31 13:21:21 +0200 |
| commit | b162e83c498b578523cef3360fa7651cfc23b4a9 (patch) | |
| tree | 6f215042cef2dc6922aa805aa04314dacc3c3cea /src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h | |
| parent | 920d96c4732ea2135553c843e811250d64fc977f (diff) | |
compilefix for removed qwlcompositor_p.h header in HW integrations
and other api adjustments
Change-Id: Idda1bfa314d401f59029f2adafbb245a47c267ac
Diffstat (limited to 'src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h')
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index 812537024..70b774ef0 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -55,10 +55,10 @@ public: XCompositeGLXClientBufferIntegration(); ~XCompositeGLXClientBufferIntegration(); - void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE; + void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE; void bindTextureToBuffer(struct ::wl_resource *buffer) Q_DECL_OVERRIDE; - bool isYInverted(struct ::wl_resource *) const Q_DECL_OVERRIDE; + QWaylandSurface::Origin origin(struct ::wl_resource *) const Q_DECL_OVERRIDE; QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE; |