diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-17 10:48:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-17 10:48:28 +0200 |
| commit | e99dae74353e5652794d7bcbcd3d79b1478debbc (patch) | |
| tree | 6d0ab88f8aa6f464e66429899418f1adf63b0651 /src/compositor/extensions | |
| parent | e3feecfd96d8fcd65556d325c806153a3495d5b3 (diff) | |
| parent | 7f70da6a644bc5b690066f0ab4814e1358f57e81 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ia0f9d099e92a40cae7ec506781f70c56415bcf89
Diffstat (limited to 'src/compositor/extensions')
| -rw-r--r-- | src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp index e468220f9..bc23131be 100644 --- a/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp +++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE /*! * \qmltype ShellSurfaceItem + * \inherits WaylandQuickItem * \inqmlmodule QtWayland.Compositor * \since 5.8 * \brief A Qt Quick item type representing a WlShellSurface. @@ -133,9 +134,19 @@ void QWaylandQuickShellSurfaceItem::setShellSurface(QWaylandShellSurface *shellS } /*! + * \qmlproperty Item QtWaylandCompositor::ShellSurfaceItem::moveItem + * + * This property holds the move item for this ShellSurfaceItem. This is the item that will be moved + * when the clients request the ShellSurface to be moved, maximized, resized etc. This property is + * useful when implementing server-side decorations. + */ + +/*! * \property QWaylandQuickShellSurfaceItem::moveItem * - * This property holds the move item for this QWaylandQuickShellSurfaceItem. + * This property holds the move item for this QWaylandQuickShellSurfaceItem. This is the item that + * will be moved when the clients request the QWaylandShellSurface to be moved, maximized, resized + * etc. This property is useful when implementing server-side decorations. */ QQuickItem *QWaylandQuickShellSurfaceItem::moveItem() const { |