diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-20 12:21:29 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-06-20 12:21:29 +0200 |
| commit | 672fe5d43cd256813acdda95e2cd9a4d22ad705a (patch) | |
| tree | c7b97b36b1798373caf929f6765b2b804c10516f /src/plugins/platforms/wayland/qwaylanddisplay.cpp | |
| parent | 83130d791dafaa437486fe740b8fcd18ee82e3c8 (diff) | |
Restoring QT_WAYLAND_GL_SUPPORT ifdefs.
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylanddisplay.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 324f9dc632..6f61cf1012 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -47,7 +47,9 @@ #include "qwaylandinputdevice.h" #include "qwaylandclipboard.h" +#ifdef QT_WAYLAND_GL_SUPPORT #include "gl_integration/qwaylandglintegration.h" +#endif #ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT #include "windowmanager_integration/qwaylandwindowmanagerintegration.h" @@ -91,10 +93,12 @@ struct wl_visual *QWaylandDisplay::argbPremultipliedVisual() return premultiplied_argb_visual; } +#ifdef QT_WAYLAND_GL_SUPPORT QWaylandGLIntegration * QWaylandDisplay::eglIntegration() { return mEglIntegration; } +#endif #ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT QWaylandWindowManagerIntegration *QWaylandDisplay::windowManagerIntegration() @@ -132,7 +136,9 @@ QWaylandDisplay::QWaylandDisplay(void) wl_display_add_global_listener(mDisplay, QWaylandDisplay::displayHandleGlobal, this); +#ifdef QT_WAYLAND_GL_SUPPORT mEglIntegration = QWaylandGLIntegration::createGLIntegration(this); +#endif #ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT mWindowManagerIntegration = QWaylandWindowManagerIntegration::createIntegration(this); @@ -142,7 +148,9 @@ QWaylandDisplay::QWaylandDisplay(void) qRegisterMetaType<uint32_t>("uint32_t"); +#ifdef QT_WAYLAND_GL_SUPPORT mEglIntegration->initialize(); +#endif connect(QAbstractEventDispatcher::instance(), SIGNAL(aboutToBlock()), this, SLOT(flushRequests())); @@ -157,7 +165,9 @@ QWaylandDisplay::QWaylandDisplay(void) QWaylandDisplay::~QWaylandDisplay(void) { close(mFd); +#ifdef QT_WAYLAND_GL_SUPPORT delete mEglIntegration; +#endif wl_display_destroy(mDisplay); } |