summaryrefslogtreecommitdiffstats
path: root/src/compositor
diff options
context:
space:
mode:
Diffstat (limited to 'src/compositor')
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp2
-rw-r--r--src/compositor/compositor_api/qwaylandseat.h1
-rw-r--r--src/compositor/configure.json3
-rw-r--r--src/compositor/extensions/qwaylandquickshellsurfaceitem.cpp13
4 files changed, 15 insertions, 4 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 3f5bbc715..bfd252753 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -742,7 +742,7 @@ void QWaylandQuickItem::handleSubsurfaceAdded(QWaylandSurface *childSurface)
/*!
- \qmlproperty bool QtWaylandCompositor::WaylandQuickItem::subsurfaceHandler
+ \qmlproperty object QtWaylandCompositor::WaylandQuickItem::subsurfaceHandler
This property provides a way to override the default subsurface behavior.
diff --git a/src/compositor/compositor_api/qwaylandseat.h b/src/compositor/compositor_api/qwaylandseat.h
index 5af10a45a..86cf250a6 100644
--- a/src/compositor/compositor_api/qwaylandseat.h
+++ b/src/compositor/compositor_api/qwaylandseat.h
@@ -97,7 +97,6 @@ public:
void sendKeyReleaseEvent(uint code);
void sendFullKeyEvent(QKeyEvent *event);
- void sendFullKeyEvent(QWaylandSurface *surface, QKeyEvent *event);
uint sendTouchPointEvent(QWaylandSurface *surface, int id, const QPointF &point, Qt::TouchPointState state);
void sendTouchFrameEvent(QWaylandClient *client);
diff --git a/src/compositor/configure.json b/src/compositor/configure.json
index 733ccfc03..a95c4eb01 100644
--- a/src/compositor/configure.json
+++ b/src/compositor/configure.json
@@ -18,7 +18,8 @@
"test": "wayland_egl",
"sources": [
{ "type": "pkgConfig", "args": "wayland-egl" },
- "-lwayland-egl"
+ "-lwayland-egl",
+ "-lEGL"
]
},
"xcomposite": {
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
{