diff options
| author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-03-29 15:04:42 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@theqtcompany.com> | 2016-04-05 14:05:28 +0000 |
| commit | 465e6f559fccf04203997cdf5182693567a9e697 (patch) | |
| tree | ca1c50eb8fd3a26e02d8a2b205d1775febb0859e /examples/wayland/multi-output | |
| parent | ac670666395882c60b512ff493b66d58a1ad6541 (diff) | |
Rename compositor Shell to WlShell
* QWaylandShell -> QWaylandWlShell
* QWaylandShellSurface -> QWaylandWlShellSurface
* QWaylandQuickShellSurfaceItem -> QWaylandQuickWlShellSurfaceItem
* Shell -> WlShell (QML)
* ShellSurface -> WlShellSurface (QML)
* ShellSurfaceItem -> WlShellSurfaceItem (QML)
This is done to avoid confusion with XdgShell and will hopefully help
clarify that some of the examples only support wl_shell and not
xdg_shell.
Additionally, this makes "Shell" an available name in the compositor
API, which may in turn enable the creation of a more general abstraction
hiding the details of the shell backends (i.e. xdg_shell, wl_shell, and
eventually ivi_shell).
Change-Id: Iebac1f36505084bfaaea68838005d54db6c55e21
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'examples/wayland/multi-output')
| -rw-r--r-- | examples/wayland/multi-output/qml/ShellChrome.qml | 4 | ||||
| -rw-r--r-- | examples/wayland/multi-output/qml/main.qml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/wayland/multi-output/qml/ShellChrome.qml b/examples/wayland/multi-output/qml/ShellChrome.qml index 83f883dac..1dc90647d 100644 --- a/examples/wayland/multi-output/qml/ShellChrome.qml +++ b/examples/wayland/multi-output/qml/ShellChrome.qml @@ -41,10 +41,10 @@ import QtQuick 2.0 import QtWayland.Compositor 1.0 -ShellSurfaceItem { +WlShellSurfaceItem { id: rootChrome - shellSurface: ShellSurface { + shellSurface: WlShellSurface { } onSurfaceDestroyed: { diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml index a6a7f8a8d..9e11d3613 100644 --- a/examples/wayland/multi-output/qml/main.qml +++ b/examples/wayland/multi-output/qml/main.qml @@ -82,7 +82,7 @@ WaylandCompositor { } extensions: [ - Shell { + WlShell { id: defaultShell onCreateShellSurface: { |