diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:52 +0200 |
| commit | 20ebb685e0fef048e56ed19403575634ce4b3435 (patch) | |
| tree | 6ad6fedfbe4d361e40a0307f1f0cdc39044b53b6 /src/compositor/extensions | |
| parent | e1f89e15cf00420bd77ac16a867a1cadc9b942fc (diff) | |
| parent | 3cb09edd71745edda4bbe8de3a6d7ad8e4ea5f58 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I76bfc271efcf75c75bf38f4bf58503e1d2a00839
Diffstat (limited to 'src/compositor/extensions')
| -rw-r--r-- | src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp index bc23131be..b43ee957a 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp @@ -95,18 +95,17 @@ QWaylandQuickShellSurfaceItem::QWaylandQuickShellSurfaceItem(QWaylandQuickShellS /*! * \qmlproperty object QtWaylandCompositor::ShellSurfaceItem::shellSurface * - * This property holds the shell surface rendered by this ShellSurfaceItem. - * It may either be an XdgSurface or a WlShellSurface depending on which - * shell protocol is in use. + * This property holds the ShellSurface rendered by this ShellSurfaceItem. + * It may either be an XdgSurfaceV5, WlShellSurface or IviSurface depending on which shell protocol + * is in use. */ /*! * \property QWaylandQuickShellSurfaceItem::shellSurface * - * This property holds the shell surface rendered by this - * QWaylandQuickShellSurfaceItem. It may either be a QWaylandXdgSurface or a - * QWaylandWlShellSurface depending on which shell protocol is in use. - * + * This property holds the QWaylandShellSurface rendered by this QWaylandQuickShellSurfaceItem. + * It may either be a QWaylandXdgSurfaceV5, QWaylandWlShellSurface or QWaylandIviSurface depending + * on which shell protocol is in use. */ QWaylandShellSurface *QWaylandQuickShellSurfaceItem::shellSurface() const { |