diff options
| author | Jan Arne Petersen <jan.petersen@kdab.com> | 2015-12-30 00:08:17 +0100 |
|---|---|---|
| committer | Giulio Camuffo <giulio.camuffo@kdab.com> | 2016-04-18 11:39:14 +0000 |
| commit | 5444ea50bb2b1b894d5b3c33676f9ef207fdcd1a (patch) | |
| tree | 72ca3e6b3f6530ffe16795a96a717b5666cd5284 /src/compositor/compositor.pro | |
| parent | 68f40f95972b857433df424cc16809eebfd77b8f (diff) | |
Fix text-input support for new API
Update text input support to upstream text-input protocol v2 from
wayland-protocols. Remove support for input-method protocol for now.
Map text-input protocol on compositor side to the Qt input method API,
this allows to use any qt platform input method on compositor side
(especially qtvirtualkeyboard). Add support for qtvirtualkeyboard to
pure-qml example.
Implement all missing functions of the text-input protocol.
Change-Id: I597451ff65454a63dff86026b6a8d1ffbe07ce02
Done-with: Zeno Endemann <zeno.endemann@kdab.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src/compositor/compositor.pro')
| -rw-r--r-- | src/compositor/compositor.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compositor/compositor.pro b/src/compositor/compositor.pro index 67c735f98..37f670964 100644 --- a/src/compositor/compositor.pro +++ b/src/compositor/compositor.pro @@ -20,8 +20,8 @@ QMAKE_DOCS = $$PWD/doc/qtwaylandcompositor.qdocconf } INCLUDEPATH += ../shared -HEADERS += ../shared/qwaylandmimehelper.h -SOURCES += ../shared/qwaylandmimehelper.cpp +HEADERS += ../shared/qwaylandmimehelper.h ../shared/qwaylandinputmethodeventbuilder.h +SOURCES += ../shared/qwaylandmimehelper.cpp ../shared/qwaylandinputmethodeventbuilder.cpp include ($$PWD/global/global.pri) include ($$PWD/wayland_wrapper/wayland_wrapper.pri) |