Document the window property for qml and register the revision

Change-Id: I52d54d022ccd6f727abdb1c109b7fd2336425eea
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 7020f81..f7dc211 100644 (file)
--- 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 0aed784..7d75c76 100644 (file)
--- 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()