From 465e6f559fccf04203997cdf5182693567a9e697 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Tue, 29 Mar 2016 15:04:42 +0200 Subject: 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 --- examples/wayland/multi-output/qml/ShellChrome.qml | 4 ++-- examples/wayland/multi-output/qml/main.qml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'examples/wayland/multi-output') 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: { -- cgit v1.2.3