aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@theqtcompany.com>2016-01-22 12:23:45 +0100
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-01-22 12:12:29 +0000
commit2d7921184e86c9dcd4189bd7da79b3fa050abedc (patch)
tree4c6ca7d3502953f4cfaaded95ceacb6a7f2087b6 /src
parent978993b3a3316db365ade6131248e852041b855b (diff)
Doc: corrected some minor link issues
Change-Id: I6bdd485eafe2c2a0c925690dab451664af1223dc Task-number: QTBUG-43810 Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/qquickitem.cpp4
-rw-r--r--src/quick/items/qquickwindow.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 059bb4beb1..53342d5224 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -4229,7 +4229,7 @@ void QQuickItem::setBaselineOffset(qreal offset)
* The call to QQuickItem::updatePaintNode() will always happen if the
* item is showing in a QQuickWindow.
*
- * Only items which specifies QQuickItem::ItemHasContents are allowed
+ * Only items which specify QQuickItem::ItemHasContents are allowed
* to call QQuickItem::update().
*/
void QQuickItem::update()
@@ -4269,7 +4269,7 @@ void QQuickItem::polish()
\qmlmethod object QtQuick::Item::mapFromItem(Item item, real x, real y, real width, real height)
Maps the point (\a x, \a y) or rect (\a x, \a y, \a width, \a height), which is in \a
- item's coordinate system, to this item's coordinate system, and returns a \l point or \rect
+ item's coordinate system, to this item's coordinate system, and returns a \l point or \l rect
matching the mapped coordinate.
If \a item is a \c null value, this maps the point or rect from the coordinate system of
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index e12b22bb00..53527dcbd1 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -3983,7 +3983,7 @@ void QQuickWindow::resetOpenGLState()
*/
/*!
- \qmlproperty Window::active
+ \qmlproperty bool Window::active
\since 5.1
The active status of the window.