diff options
| author | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2011-05-25 09:24:37 (GMT) |
|---|---|---|
| committer | Lasse Holmstedt <lasse.holmstedt@nokia.com> | 2011-05-25 12:24:16 (GMT) |
| commit | dffe4d8d180e34955ebe23540e37ce7ba0d76853 (patch) | |
| tree | b4be69feccf4bc9f016402bf8f307ecd7817c5db /src/plugins/platforms/wayland/qwaylanddisplay.cpp | |
| parent | a6642e4659b3d45ffa94f9a3c6413124d49f2b91 (diff) | |
| download | Qt-dffe4d8d180e34955ebe23540e37ce7ba0d76853.zip Qt-dffe4d8d180e34955ebe23540e37ce7ba0d76853.tar.gz Qt-dffe4d8d180e34955ebe23540e37ce7ba0d76853.tar.bz2 | |
Add authentication token support for wayland windows
For compositors that support it, the wayland clients can associate themselves
with an auth token, specified by WL_AUTHENTICATION_TOKEN env var, or by
directly specifying it in the wayland client plugin.
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylanddisplay.cpp')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index dcfaf0f..da908fb 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -137,6 +137,11 @@ QWaylandDisplay::QWaylandDisplay(void) #ifdef QT_WAYLAND_GL_SUPPORT mEglIntegration = QWaylandGLIntegration::createGLIntegration(this); #endif + +#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT + mWindowManagerIntegration = QWaylandWindowManagerIntegration::createIntegration(this); +#endif + blockingReadEvents(); qRegisterMetaType<uint32_t>("uint32_t"); @@ -145,10 +150,6 @@ QWaylandDisplay::QWaylandDisplay(void) mEglIntegration->initialize(); #endif -#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT - mWindowManagerIntegration = QWaylandWindowManagerIntegration::createIntegration(this); -#endif - connect(QAbstractEventDispatcher::instance(), SIGNAL(aboutToBlock()), this, SLOT(flushRequests())); mFd = wl_display_get_fd(mDisplay, sourceUpdate, this); |