aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickcanvas.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-07-03 15:51:04 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-05 03:34:58 +0200
commit9df0c50fe588df64b65b968cd59f98d06024aad1 (patch)
tree9447f52b9ab365bd9800cd73305bfd4f716ff8d6 /src/quick/items/qquickcanvas.cpp
parent3f43e7d58f49e55e97281792d32df1595b0e7464 (diff)
Fix various QtQuick.* submodule docs
- Create module index pages for QtQuick.Window, QtQuick.XmlListModel and QtQuick.LocalStorage. - Fix references to module names in docs so that docs for properties and methods are actually generated e.g. use "QtQuick.Window2" instead of "QtQuick2.Window". There's no easy way to document Module APIs at the moment so the QtQuick.LocalStorage documentation has been updated in a hacky way to generate the correct method documentation. Change-Id: I7b34e4b4ac794acffc6d198b98e2115ccf0fa9a6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickcanvas.cpp')
-rw-r--r--src/quick/items/qquickcanvas.cpp16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp
index 12173a3e26..2de8fd5030 100644
--- a/src/quick/items/qquickcanvas.cpp
+++ b/src/quick/items/qquickcanvas.cpp
@@ -773,6 +773,20 @@ void QQuickCanvasPrivate::cleanup(QSGNode *n)
/*!
+ \qmlmodule QtQuick.Window 2
+ \title QML Module QtQuick.Window 2.0
+ \brief Contains types for window management
+
+ This QML module contains types for creating top-level windows and accessing screen information.
+
+ To use the types in this module, import the module with the following line:
+
+ \code
+ import QtQuick.Window 2.0
+ \endcode
+*/
+
+/*!
\qmlclass Window QQuickCanvas
\inqmlmodule QtQuick.Window 2
\ingroup qtquick-visual
@@ -1043,7 +1057,7 @@ QQuickItem *QQuickCanvas::mouseGrabberItem() const
/*!
- \qmlproperty color QtQuick2.Window::Window::color
+ \qmlproperty color QtQuick.Window2::Window::color
The background color for the window.