diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-11-25 10:49:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-27 21:39:45 +0100 |
| commit | d747b0a3cac5e9a3d7c3f4f53bf9da3b88187698 (patch) | |
| tree | 628ba8ead251324ba8eb52882c62c3b0726c9af2 /src/client/qwaylanddisplay.cpp | |
| parent | dcef544fb24f810b21fa38cc0e9e77f3a4f86ba8 (diff) | |
Add hardware integration protocol
This sends to clients what HW integration is being used in the
compositor. This is useful when the wayland clients are loading their
buffer integrations with plugins since they then can pick the correct
plugin automatically.
Change-Id: Ib4eac3b855c6772ac1581b7f06aa929aeb1a1db0
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src/client/qwaylanddisplay.cpp')
| -rw-r--r-- | src/client/qwaylanddisplay.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index e6981ed52..3f771f1df 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -49,8 +49,8 @@ #include "qwaylandinputdevice.h" #include "qwaylandclipboard.h" #include "qwaylanddatadevicemanager.h" +#include "qwaylandhardwareintegration.h" -#include "qwaylandclientbufferintegration.h" #include "qwaylandwindowmanagerintegration.h" @@ -110,6 +110,7 @@ QWaylandDisplay::QWaylandDisplay(QWaylandIntegration *waylandIntegration) , mTouchExtension(0) , mQtKeyExtension(0) , mTextInputManager(0) + , mHardwareIntegration(0) { display = this; qRegisterMetaType<uint32_t>("uint32_t"); @@ -232,6 +233,8 @@ void QWaylandDisplay::registry_global(uint32_t id, const QString &interface, uin mQtKeyExtension = new QWaylandQtKeyExtension(this, id); } else if (interface == QStringLiteral("wl_text_input_manager")) { mTextInputManager = new QtWayland::wl_text_input_manager(registry, id); + } else if (interface == QStringLiteral("qt_hardware_integration")) { + mHardwareIntegration = new QWaylandHardwareIntegration(registry, id); } foreach (Listener l, mRegistryListeners) |