aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/qtquick.qdoc
diff options
context:
space:
mode:
authorChris Adams <christopher.adams@nokia.com>2012-07-17 12:19:31 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-19 10:02:40 +0200
commitb523301a668e6c6cc5fc93440842ad063066f12b (patch)
tree236d84bdd510a7d64f6a5cc08699da2ecd0246be /src/quick/doc/src/qtquick.qdoc
parent9fe378497773dc2b8682b8c49375c7d913de5f8d (diff)
Add documentation about property value modifiers
Previously, property value modifiers were only documented in QtQuick, when really they are a QtQml module / QML language feature. This commit also improves the QtQuick documentation for convenience types, and rearranges some links and content for improved consistency. Change-Id: Ic4dbe0b8bb85bdfbb8ac2f336c13c2960f8d1842 Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/quick/doc/src/qtquick.qdoc')
-rw-r--r--src/quick/doc/src/qtquick.qdoc20
1 files changed, 9 insertions, 11 deletions
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 3b980c5212..a5900caa1e 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -53,13 +53,12 @@ a first-class concept in Qt Quick.
\list
\li \l{qtquick-visualcanvas-topic.html}{The Visual Canvas}
-\li \l{qtquick-positioning-topic.html}{Positioning}
\li \l{qtquick-input-topic.html}{User Input}
-\li \l{qtquick-eventinterceptors-topic.html}{Event Interceptors}
-\li \l{qtquick-statesanimations-topic.html}{States, Transitions and Animations}
+\li \l{qtquick-positioning-topic.html}{Positioning}
+\li \l{qtquick-statesanimations-topic.html}{States, Transitions And Animations}
\li \l{qtquick-modelviewsdata-topic.html}{Data - Models, Views and Data Storage}
-\li \l{qtquick-effects-topic.html}{Graphical Effects and Particles}
-\li \l{qtquick-dynamicinstantiation-topic.html}{Dynamic and Lazy Instantiation}
+\li \l{qtquick-effects-topic.html}{Particles And Graphical Effects}
+\li \l{qtquick-convenience-topic.html}{Convenience Types}
\endlist
When using the QtQuick module, you will need to know how to write QML
@@ -79,17 +78,16 @@ To find out more about using the QML language, see the \l{Qt QML Module Document
\li \l{qtquick-qmltypereference.html#visual-types}{Visual Types}
\li \l{qtquick-qmltypereference.html#user-input-types}{User Input Types}
\li \l{qtquick-qmltypereference.html#positioning}{Positioning}
- \li \l{qtquick-qmltypereference.html#states-transitions-and-animations}{States, Transitions and Animations}
- \li \l{qtquick-qmltypereference.html#interceptors}{Interceptors}
- \li \l{qtquick-qmltypereference.html#model-view-types-and-data-storage-and-access}{Model/View Types and Data Storage and Access}
- \li \l{qtquick-qmltypereference.html#particles-and-graphical-effects}{Particles and Graphical Effects}
+ \li \l{qtquick-qmltypereference.html#states-transitions-and-animations}{States, Transitions And Animations}
+ \li \l{qtquick-qmltypereference.html#model-view-types-and-data-storage-and-access}{Model/View Types And Data Storage And Access}
+ \li \l{qtquick-qmltypereference.html#particles-and-graphical-effects}{Particles And Graphical Effects}
+ \li \l{qtquick-qmltypereference.html#convenience-types}{Convenience Types}
\li \l{qtquick-qmltypereference.html#canvas-similar-to-html5-canvas}{Canvas (similar to HTML5 Canvas)}
- \li \l{qtquick-qmltypereference.html#dynamic-instantiation-enablers}{Dynamic Instantiation Enablers}
\endlist
\li \l{qtquick-cppextensionpoints.html}{C++ Extension Points}
\list
- \li \l{qtquick-cppextensionpoints.html#user-defined-qquickitem-derived-types}{User-Defined QQuickItem-Derived Types}
+ \li \l{qtquick-cppextensionpoints.html#user-defined-qquickitem-derived-types}{Creating User-Defined QQuickItem-Derived Types}
\li \l{qtquick-cppextensionpoints.html#scene-graph-related-classes}{Scene Graph-Related Classes}
\endlist