summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2019-02-26 10:17:39 +0100
committerJohan Helsing <johan.helsing@qt.io>2019-02-27 13:20:40 +0000
commit539bba3f334843772e2ff9569f2bce633ce191f0 (patch)
tree13e0216c8d144b7d98acf7762d64648c75f82a37
parent19e4f721c596a1a2f6446e24e7993b0e6d8a91a7 (diff)
downloadqtwayland-539bba3f334843772e2ff9569f2bce633ce191f0.tar.gz
Compositor: Add missing version information for new API
Change-Id: Ieec4a97d901f236d2cec003d8b35e2f95b1b2aea Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/compositor/compositor_api/qwaylandquickitem.cpp18
-rw-r--r--src/compositor/compositor_api/qwaylandsurface.cpp4
2 files changed, 22 insertions, 0 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp
index 2b31bc90..090c8277 100644
--- a/src/compositor/compositor_api/qwaylandquickitem.cpp
+++ b/src/compositor/compositor_api/qwaylandquickitem.cpp
@@ -1058,6 +1058,14 @@ bool QWaylandQuickItem::inputRegionContains(const QPointF &localPosition)
}
/*!
+ * \qmlmethod point WaylandQuickItem::mapToSurface(point point)
+ *
+ * Maps the given \a point in this item's coordinate system to the equivalent
+ * point within the Wayland surface's coordinate system, and returns the mapped
+ * coordinate.
+ */
+
+/*!
* Maps the given \a point in this item's coordinate system to the equivalent
* point within the Wayland surface's coordinate system, and returns the mapped
* coordinate.
@@ -1075,9 +1083,19 @@ QPointF QWaylandQuickItem::mapToSurface(const QPointF &point) const
}
/*!
+ * \qmlmethod point WaylandQuickItem::mapFromSurface(point point)
+ * \since 5.13
+ *
* Maps the given \a point in the Wayland surfaces's coordinate system to the equivalent
* point within this item's coordinate system, and returns the mapped coordinate.
*/
+
+/*!
+ * Maps the given \a point in the Wayland surfaces's coordinate system to the equivalent
+ * point within this item's coordinate system, and returns the mapped coordinate.
+ *
+ * \since 5.13
+ */
QPointF QWaylandQuickItem::mapFromSurface(const QPointF &point) const
{
Q_D(const QWaylandQuickItem);
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index cc61fb17..5f1ac6e4 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -481,6 +481,7 @@ bool QWaylandSurface::hasContent() const
/*!
* \qmlproperty rect QtWaylandCompositor::WaylandSurface::sourceGeometry
+ * \since 5.13
*
* This property describes the portion of the attached Wayland buffer that should
* be drawn on the screen. The coordinates are from the corner of the buffer and are
@@ -493,6 +494,7 @@ bool QWaylandSurface::hasContent() const
/*!
* \property QWaylandSurface::sourceGeometry
+ * \since 5.13
*
* This property describes the portion of the attached QWaylandBuffer that should
* be drawn on the screen. The coordinates are from the corner of the buffer and are
@@ -510,6 +512,7 @@ QRectF QWaylandSurface::sourceGeometry() const
/*!
* \qmlproperty size QtWaylandCompositor::WaylandSurface::destinationSize
+ * \since 5.13
*
* This property holds the size of this WaylandSurface in surface coordinates.
*
@@ -519,6 +522,7 @@ QRectF QWaylandSurface::sourceGeometry() const
/*!
* \property QWaylandSurface::destinationSize
+ * \since 5.13
*
* This property holds the size of this WaylandSurface in surface coordinates.
*