diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-20 12:26:39 +0200 |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-28 13:10:33 +0200 |
| commit | 88f821e189bd1d4d4550c1864f622ca7df2a7c34 (patch) | |
| tree | 291fd0a8155c448ea13df57a6b1f6f7966894ed0 /src/compositor/extensions/extensions.pri | |
| parent | 9c88f97492959025f7433c9a379b474095efc0dd (diff) | |
Remove automatic initialisation of extensions
It is the specific compositor application responsibillity to create the
specific extensions. Some of the extensions are picked up with the
QWaylandExtension::findIn(QWaylandExtensionContainer *) function to work
around missing events/apis. It should be a goal not to have these calles
in the base implementation of QWayland[Compositor|Surface|Input..].
Change-Id: Iacd576f2e8a79ca0165b858b1e8f44cddad48d93
Diffstat (limited to 'src/compositor/extensions/extensions.pri')
| -rw-r--r-- | src/compositor/extensions/extensions.pri | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri index decb142c6..14b435ff7 100644 --- a/src/compositor/extensions/extensions.pri +++ b/src/compositor/extensions/extensions.pri @@ -4,6 +4,9 @@ WAYLANDSERVERSOURCES += \ ../extensions/touch-extension.xml \ ../extensions/qtkey-extension.xml \ ../extensions/windowmanager.xml \ + ../3rdparty/protocol/input-method.xml \ + ../3rdparty/protocol/text.xml \ + ../extensions/hardware-integration.xml \ HEADERS += \ extensions/qwlextendedsurface_p.h \ @@ -16,6 +19,9 @@ HEADERS += \ extensions/qwltextinputmanager_p.h \ extensions/qwlinputpanel_p.h \ extensions/qwlinputpanelsurface_p.h \ + extensions/qwlinputmethod_p.h \ + extensions/qwlinputmethodcontext_p.h \ + extensions/qwlhwintegration_p.h \ SOURCES += \ extensions/qwlextendedsurface.cpp \ @@ -27,5 +33,8 @@ SOURCES += \ extensions/qwltextinputmanager.cpp \ extensions/qwlinputpanel.cpp \ extensions/qwlinputpanelsurface.cpp \ + extensions/qwlinputmethod.cpp \ + extensions/qwlinputmethodcontext.cpp \ + extensions/qwlhwintegration.cpp \ INCLUDEPATH += extensions |