diff options
| author | Giulio Camuffo <giulio.camuffo@jollamobile.com> | 2014-11-07 14:43:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-11-15 18:46:38 +0100 |
| commit | 4613291e8c1717d8d3316b2c0b1f2c6c96bdc56f (patch) | |
| tree | d815d5dc56c46361146b2ee3ce2b6c2a2cc2c6bb /src/client/qwaylandintegration.cpp | |
| parent | 23ecb57e11bea42c2e90d280b21b6ee448a9afff (diff) | |
| parent | 7882407bb6bab6c042fd20592a63a875b74eb581 (diff) | |
Merge branch '5.4' into dev
Merge done by Giulio Camuffo
Conflicts:
src/client/client.pro
src/client/qwaylanddisplay.cpp
src/client/qwaylandinputdevice.cpp
src/client/qwaylandinputdevice_p.h
src/client/qwaylandwindow.cpp
src/compositor/compositor_api/qwaylandsurface.cpp
src/compositor/compositor_api/qwaylandsurface_p.h
src/compositor/wayland_wrapper/qwlsurface.cpp
Change-Id: I1df878bb54f49d953c51215a2772869e261ebe81
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index ad99c67b9..27613eef7 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -181,12 +181,14 @@ QPlatformWindow *QWaylandIntegration::createPlatformWindow(QWindow *window) cons return new QWaylandShmWindow(window); } +#ifndef QT_NO_OPENGL QPlatformOpenGLContext *QWaylandIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const { if (mDisplay->clientBufferIntegration()) return mDisplay->clientBufferIntegration()->createPlatformOpenGLContext(context->format(), context->shareHandle()); return 0; } +#endif // QT_NO_OPENGL QPlatformBackingStore *QWaylandIntegration::createPlatformBackingStore(QWindow *window) const { @@ -367,12 +369,12 @@ void QWaylandIntegration::initializeShellIntegration() } } -QWaylandInputDevice *QWaylandIntegration::createInputDevice(QWaylandDisplay *display, uint32_t id) +QWaylandInputDevice *QWaylandIntegration::createInputDevice(QWaylandDisplay *display, int version, uint32_t id) { if (mInputDeviceIntegration) { - return mInputDeviceIntegration->createInputDevice(display, id); + return mInputDeviceIntegration->createInputDevice(display, version, id); } - return new QWaylandInputDevice(display, id); + return new QWaylandInputDevice(display, version, id); } void QWaylandIntegration::initializeInputDeviceIntegration() |