diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-05-07 03:01:52 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-05-07 12:39:12 +0200 |
| commit | 17b1705ce4c8bc9ca19a6b424a00a045134b3aac (patch) | |
| tree | 03e7b7d461064dd007179cd29da9c024e6c8f190 /examples | |
| parent | 4ab3cbcc5c4da6384e9081993c5ba24303a382bd (diff) | |
| parent | a658a10f6a42e67bd762f87851c23cc1c1e3b141 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/client/qwaylanddisplay_p.h
src/client/qwaylandwindow.cpp
Change-Id: I50eb5c83a8b81e4bdb032b68d41f429b17d0a74d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wayland/pure-qml/qml/main.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml index 69be7cf10..483de7514 100644 --- a/examples/wayland/pure-qml/qml/main.qml +++ b/examples/wayland/pure-qml/qml/main.qml @@ -72,6 +72,6 @@ WaylandCompositor { onWlShellSurfaceCreated: screen.handleShellSurface(shellSurface) } - // Extension for Virtual keyboard support + // Extension for Input Method (QT_IM_MODULE) support at compositor-side TextInputManager {} } |