aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/quick/items/qquickitem.cpp6
-rw-r--r--src/quick/items/qquickitemsmodule.cpp2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 7020f810ca..f7dc21148c 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -2428,6 +2428,12 @@ void QQuickItem::stackAfter(const QQuickItem *sibling)
*/
/*!
+ \qmlproperty Window QtQuick::Item::window
+ \since 5.4
+ This property holds the window in which the item is rendered.
+ */
+
+/*!
Returns the window in which this item is rendered.
The item does not have a window until it has been assigned into a scene. The
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index 0aed784b2e..7d75c7693d 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -274,6 +274,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
qmlRegisterType<QQuickText, 3>(uri, 2, 3, "Text");
qmlRegisterType<QQuickTextEdit, 3>(uri, 2, 3, "TextEdit");
qmlRegisterType<QQuickImage, 1>(uri, 2, 3,"Image");
+
+ qmlRegisterType<QQuickItem, 2>(uri, 2, 4, "Item");
}
static void initResources()