diff options
author | Jan Arne Petersen <jan.petersen@kdab.com> | 2013-10-31 12:55:08 +0100 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@digia.com> | 2013-11-22 15:45:54 +0100 |
commit | c83b4313b34b142750601ac95c10015bb9993ce8 (patch) | |
tree | 73f66a1a97cf44ef911415ffe1ad66cafd8b8d6f /src/compositor/wayland_wrapper/wayland_wrapper.pri | |
parent | d7a8b4eadf3696218296df706e123b9038146236 (diff) |
Add support for text protocol to compositor
Change-Id: Iff22ba8b10f4ae986acba416d6fbbd4cf4f722e5
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/compositor/wayland_wrapper/wayland_wrapper.pri')
-rw-r--r-- | src/compositor/wayland_wrapper/wayland_wrapper.pri | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/compositor/wayland_wrapper/wayland_wrapper.pri b/src/compositor/wayland_wrapper/wayland_wrapper.pri index 86a06a0bc..3b695532c 100644 --- a/src/compositor/wayland_wrapper/wayland_wrapper.pri +++ b/src/compositor/wayland_wrapper/wayland_wrapper.pri @@ -6,7 +6,9 @@ WAYLANDSERVERSOURCES += \ ../extensions/touch-extension.xml \ ../extensions/qtkey-extension.xml \ ../extensions/windowmanager.xml \ - ../3rdparty/protocol/wayland.xml + ../3rdparty/protocol/wayland.xml \ + ../3rdparty/protocol/input-method.xml \ + ../3rdparty/protocol/text.xml HEADERS += \ wayland_wrapper/qwlcompositor_p.h \ @@ -18,6 +20,10 @@ HEADERS += \ wayland_wrapper/qwlextendedoutput_p.h \ wayland_wrapper/qwlextendedsurface_p.h \ wayland_wrapper/qwlinputdevice_p.h \ + wayland_wrapper/qwlinputmethod_p.h \ + wayland_wrapper/qwlinputmethodcontext_p.h \ + wayland_wrapper/qwlinputpanel_p.h \ + wayland_wrapper/qwlinputpanelsurface_p.h \ wayland_wrapper/qwlkeyboard_p.h \ wayland_wrapper/qwloutput_p.h \ wayland_wrapper/qwlpointer_p.h \ @@ -28,7 +34,9 @@ HEADERS += \ wayland_wrapper/qwlsubsurface_p.h \ wayland_wrapper/qwlsurface_p.h \ wayland_wrapper/qwlsurfacebuffer_p.h \ - wayland_wrapper/qwltouch_p.h + wayland_wrapper/qwltextinput_p.h \ + wayland_wrapper/qwltextinputmanager_p.h \ + wayland_wrapper/qwltouch_p.h \ SOURCES += \ wayland_wrapper/qwlcompositor.cpp \ @@ -40,6 +48,10 @@ SOURCES += \ wayland_wrapper/qwlextendedoutput.cpp \ wayland_wrapper/qwlextendedsurface.cpp \ wayland_wrapper/qwlinputdevice.cpp \ + wayland_wrapper/qwlinputmethod.cpp \ + wayland_wrapper/qwlinputmethodcontext.cpp \ + wayland_wrapper/qwlinputpanel.cpp \ + wayland_wrapper/qwlinputpanelsurface.cpp \ wayland_wrapper/qwlkeyboard.cpp \ wayland_wrapper/qwloutput.cpp \ wayland_wrapper/qwlpointer.cpp \ @@ -50,7 +62,9 @@ SOURCES += \ wayland_wrapper/qwlsubsurface.cpp \ wayland_wrapper/qwlsurface.cpp \ wayland_wrapper/qwlsurfacebuffer.cpp \ - wayland_wrapper/qwltouch.cpp + wayland_wrapper/qwltextinput.cpp \ + wayland_wrapper/qwltextinputmanager.cpp \ + wayland_wrapper/qwltouch.cpp \ INCLUDEPATH += wayland_wrapper |