diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-22 16:26:02 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-22 16:26:02 +0200 |
| commit | f3440ddf52de23711b00bb6a6097ce46c9cd3f32 (patch) | |
| tree | 7683e9ba9884855c8873784c93410c19643923e8 /src/plugins/platforms/wayland/qwaylandintegration.cpp | |
| parent | 9512c440b5d6e5d3a0e9bc7b5657f3c2f0b00d42 (diff) | |
Get wayland plugin working again.
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index bdd8235d5b..1f1ecda0e6 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -101,10 +101,10 @@ QPixmapData *QWaylandIntegration::createPixmapData(QPixmapData::PixelType type) QPlatformWindow *QWaylandIntegration::createPlatformWindow(QWindow *window) const { #ifdef QT_WAYLAND_GL_SUPPORT - return mDisplay->eglIntegration()->createEglWindow(window); -#else - return new QWaylandShmWindow(window); + if (window->surfaceType() == QWindow::OpenGLSurface) + return mDisplay->eglIntegration()->createEglWindow(window); #endif + return new QWaylandShmWindow(window); } QPlatformGLContext *QWaylandIntegration::createPlatformGLContext(const QSurfaceFormat &glFormat, QPlatformGLContext *share) const @@ -125,7 +125,9 @@ QPlatformBackingStore *QWaylandIntegration::createPlatformBackingStore(QWindow * QAbstractEventDispatcher *QWaylandIntegration::createEventDispatcher() const { - return createUnixEventDispatcher(); + QAbstractEventDispatcher *dispatcher = createUnixEventDispatcher(); + mDisplay->eventDispatcherCreated(dispatcher); + return dispatcher; } QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const |