aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick/doc')
-rw-r--r--src/quick/doc/qtquick.qdocconf5
-rw-r--r--src/quick/doc/src/animation-define.qdoc29
-rw-r--r--src/quick/doc/src/animation.qdoc29
-rw-r--r--src/quick/doc/src/canvaspainting.qdoc14
-rw-r--r--src/quick/doc/src/containers.qdoc34
-rw-r--r--src/quick/doc/src/images.qdoc39
-rw-r--r--src/quick/doc/src/interaction.qdoc35
-rw-r--r--src/quick/doc/src/itemgraphics.qdoc35
-rw-r--r--src/quick/doc/src/models.qdoc35
-rw-r--r--src/quick/doc/src/modelview.qdoc2
-rw-r--r--src/quick/doc/src/particles/particletypes.qdoc35
-rw-r--r--src/quick/doc/src/paths.qdoc35
-rw-r--r--src/quick/doc/src/positioners.qdoc9
-rw-r--r--src/quick/doc/src/qtquicktypes.qdoc174
-rw-r--r--src/quick/doc/src/shaders.qdoc11
-rw-r--r--src/quick/doc/src/sprites.qdoc8
-rw-r--r--src/quick/doc/src/states.qdoc16
-rw-r--r--src/quick/doc/src/texthandling.qdoc71
-rw-r--r--src/quick/doc/src/transformations.qdoc35
-rw-r--r--src/quick/doc/src/uicreation.qdoc4
-rw-r--r--src/quick/doc/src/utility.qdoc35
-rw-r--r--src/quick/doc/src/views.qdoc35
-rw-r--r--src/quick/doc/src/visualtypes.qdoc35
23 files changed, 720 insertions, 40 deletions
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 452fe46ffc..423627819b 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -98,3 +98,8 @@ imagedirs += ../../qml
#add particles sources
headerdirs += ../../particles
sourcedirs += ../../particles
+
+#add imports directory because of dependencies
+headerdirs += ../../imports
+sourcedirs += ../../imports
+
diff --git a/src/quick/doc/src/animation-define.qdoc b/src/quick/doc/src/animation-define.qdoc
new file mode 100644
index 0000000000..f3f3cec1e9
--- /dev/null
+++ b/src/quick/doc/src/animation-define.qdoc
@@ -0,0 +1,29 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-animation-define
diff --git a/src/quick/doc/src/animation.qdoc b/src/quick/doc/src/animation.qdoc
index 6644e794f5..f406948040 100644
--- a/src/quick/doc/src/animation.qdoc
+++ b/src/quick/doc/src/animation.qdoc
@@ -26,11 +26,12 @@
****************************************************************************/
/*!
-\page qtquick-animation.html
+\group qtquick-animation-define
\title Animation and Transitions
\brief the animation system in Qt Quick
\section1 Animation and Transitions Elements
+\generatelist{related}
\list
\li \l {Transition} - Animates transitions during state changes
\li \l {SequentialAnimation} - Runs animations sequentially
@@ -44,6 +45,8 @@
\endlist
Elements that animate properties based on data types
+\annotatedlist qtquick-property-animation
+
\list
\li \l {PropertyAnimation} - Animates property changes
\li \l {NumberAnimation} - Animates properties of type qreal
@@ -249,3 +252,27 @@ Rectangle {
\endqml
*/
+
+/*!
+\group qtquick-animation-properties
+\title Qt Quick Property Animation
+\brief Animate property changes
+
+\generatelist{related}
+*/
+
+/*!
+\group qtquick-animation-control
+\title Qt Quick Animation Controls
+\brief Control animation sequences
+
+\generatelist{related}
+*/
+
+/*!
+\group qtquick-animation-modifiers
+\title Qt Quick Animation Modifiers
+\brief Modify animation sequences
+
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/canvaspainting.qdoc b/src/quick/doc/src/canvaspainting.qdoc
index 3b1f742b8f..d99e31ff12 100644
--- a/src/quick/doc/src/canvaspainting.qdoc
+++ b/src/quick/doc/src/canvaspainting.qdoc
@@ -26,17 +26,13 @@
****************************************************************************/
/*!
-\page qtquick-canvaspainting.html
+\group qtquick-canvas
\ingroup qml-features
-\title Painting with Canvas API
-\brief custom graphics with the Canvas API
+\title Canvas API
+\brief Custom graphics with the Canvas API
-\section1 Canvas Element
-
-\list
- \li \l{Canvas}
- \li \l{Context2D}
-\endlist
+\section1 Related Types
+\generatelist{related}
The Canvas and Context2D elements implement the \l{HTML Canvas API 2D Context}
and allows applications to have custom painting routines.
diff --git a/src/quick/doc/src/containers.qdoc b/src/quick/doc/src/containers.qdoc
new file mode 100644
index 0000000000..73e39790f5
--- /dev/null
+++ b/src/quick/doc/src/containers.qdoc
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-containers
+\title Qt Quick Containers
+\brief Specialized views for handling input and animations
+
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/images.qdoc b/src/quick/doc/src/images.qdoc
new file mode 100644
index 0000000000..842b56bcd3
--- /dev/null
+++ b/src/quick/doc/src/images.qdoc
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-images
+\ingroup qml-features
+\title Qt Quick Images
+\brief Displaying images in a QML scene
+
+\section1 Related Types
+
+\generatelist{related}
+
+
+*/
diff --git a/src/quick/doc/src/interaction.qdoc b/src/quick/doc/src/interaction.qdoc
new file mode 100644
index 0000000000..aafad3ab5c
--- /dev/null
+++ b/src/quick/doc/src/interaction.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-interaction
+\title Qt Quick Keys and Focus
+\brief Handling mouse input and interaction
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/itemgraphics.qdoc b/src/quick/doc/src/itemgraphics.qdoc
new file mode 100644
index 0000000000..3924b34eaa
--- /dev/null
+++ b/src/quick/doc/src/itemgraphics.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-item-graphics
+\title Qt Quick Item Graphics
+\brief Graphics applied onto visual types
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/models.qdoc b/src/quick/doc/src/models.qdoc
new file mode 100644
index 0000000000..6d4e69b4c9
--- /dev/null
+++ b/src/quick/doc/src/models.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-models
+\title Qt Quick Models
+\brief Structuring data for display.
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/modelview.qdoc b/src/quick/doc/src/modelview.qdoc
index e9a34b34e4..137703b822 100644
--- a/src/quick/doc/src/modelview.qdoc
+++ b/src/quick/doc/src/modelview.qdoc
@@ -56,7 +56,7 @@ To visualize data, bind the view's \c model property to a model and the
Views are containers for collections of items. They are feature-rich and can be
customizable to meet style or behavior requirements.
- \keyword qml-view-elements
+ \keyword qtquick-views
A set of standard views are provided in the basic set of Qt Quick
graphical elements:
diff --git a/src/quick/doc/src/particles/particletypes.qdoc b/src/quick/doc/src/particles/particletypes.qdoc
new file mode 100644
index 0000000000..740fc0079d
--- /dev/null
+++ b/src/quick/doc/src/particles/particletypes.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-particles
+\title Qt Quick Particle Types
+\brief Types for creating particle effects
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/paths.qdoc b/src/quick/doc/src/paths.qdoc
new file mode 100644
index 0000000000..4e963487a2
--- /dev/null
+++ b/src/quick/doc/src/paths.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-paths
+\title Qt Quick Paths
+\brief Drawing and setting paths
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/positioners.qdoc b/src/quick/doc/src/positioners.qdoc
index 4ca87cf910..f423216e15 100644
--- a/src/quick/doc/src/positioners.qdoc
+++ b/src/quick/doc/src/positioners.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
-\page qtquick-positioners.html
+\group qtquick-positioners
\ingroup qml-features
\title Item Layouts
@@ -43,12 +43,7 @@ to be arranged in a regular layout.
A set of standard positioners are provided in the basic set of Qt Quick
graphical elements:
-\list
-\li \l{#Column}{Column} arranges its children in a column
-\li \l{#Row}{Row} arranges its children in a row
-\li \l{#Grid}{Grid} arranges its children in a grid
-\li \l{#Flow}{Flow} arranges its children like words on a page
-\endlist
+\generatelist{related}
\section2 Column
diff --git a/src/quick/doc/src/qtquicktypes.qdoc b/src/quick/doc/src/qtquicktypes.qdoc
new file mode 100644
index 0000000000..d064565714
--- /dev/null
+++ b/src/quick/doc/src/qtquicktypes.qdoc
@@ -0,0 +1,174 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\page qtquick-types.html
+\title Qt Quick Types
+\brief A listing of standard types in Qt Quick
+
+
+
+These are the functionally grouped lists of Qt Quick types as part of
+\l{Qt Quick}. You can also browse the module pages for \l{QtQuick 2} and \l{QtQuick.Particles 2}
+
+\section1 Qt Quick Submodules
+
+ \section2 Particle Effects
+
+ The \l{QtQuick.Particles 2} module provides a set of Particle System types
+ for QtQuick 2. The \l{Using the Qt Quick Particle System} article describes
+ the particle system.
+
+ \section2 Local Storage
+ The \l{Local Storage}{SQL Local Storage} submodule contains a
+ JavaScript interface for an SQLite database.
+
+ \section2 XmlListModel
+
+ The \l{QtQuick.XmlListModel 2.0} submodule contains contains the
+ \l{XmlListModel} type, for using remote XML data as a model.
+
+\section1 Visual Types
+ These types are described in the \l{qtquick-visual-types}{Visual Types}
+ overview.
+ \annotatedlist qtquick-visual-types
+
+\section1 Images
+ These types are described in the
+ \l{qtquick-images}{Images} overview.
+ \annotatedlist qtquick-images
+
+\section2 Sprites
+ These types are described in the
+ \l{qtquick-images-sprites}{Sprite Animations} overview.
+ \annotatedlist qtquick-images-sprites
+
+\section1 Item Graphics
+ These types are described in the \l{qtquick-item-graphics}{Item Graphics}
+ overview.
+ \annotatedlist qtquick-item-graphics
+
+\section1 Shader Effects
+
+ These types are described in the \l{qtquick-shaders}{Shader Effects}
+ overview.
+ \annotatedlist qtquick-shaders
+
+\section1 Canvas API
+
+ These types are described in the \l{qtquick-canvas}{Canvas API} overview.
+ \annotatedlist qtquick-canvas
+\section1 Text Handling
+ These types are described in the
+ \l{Qt Quick Text Handling and Validators}{Text Handling and Validators}
+ overview.
+ \annotatedlist qtquick-text
+
+\section2 Validators
+ These types are described in the
+ \l{Qt Quick Text Handling and Validators}{Text Handling and Validators}
+ overview.
+ \annotatedlist qtquick-text-validator
+
+\section1 User Interaction
+
+ These types are described in the
+ \l{qtquick-interaction}{Interaction} overview.
+ \annotatedlist qtquick-interaction
+
+\section1 Transformations
+
+ These types are described in the \l{qtquick-transformations}{Transformation Types} overview.
+ \annotatedlist qtquick-transformations
+
+\section1 States
+
+ These types are described in the \l{qtquick-states}{States}
+ overview.
+ \annotatedlist qtquick-states
+
+\section1 Animation and Transitions
+ These types are described in the
+ \l{qtquick-animation-define}{Animation and Transitions} overview.
+ \annotatedlist qtquick-animation-define
+
+ \section2 Property Animation
+
+ These types animate property changes and are described in the
+ \l{qtquick-animation-define}{Animation and Transitions} overview.
+ \annotatedlist qtquick-animation-properties
+
+ \section2 Animation Controls
+
+ These types provide lower-level animation control. These types are
+ described in the
+ \l{qtquick-animation-define}{Animation and Transitions} overview.
+ \annotatedlist qtquick-animation-control
+
+ \section2 Animation Modifiers
+
+ These types provide specialized changes during the animation. These
+ types are described in the
+ \l{qtquick-animation-define}{Animation and Transitions} overview.
+ \annotatedlist qtquick-animation-modifiers
+
+\section1 Models
+ These types are described in the \l{qtquick-models}{Qt Quick Models}
+ overview. The \l{Models and Views} overview has information about displaying
+ data with views and delegates.
+ \annotatedlist qtquick-models
+
+\section1 Views, Positioners, and Specialized Containers
+
+ \section2 Views
+ These types are described in the \l{qtquick-views}{Views} overview.
+ The \l{Models and Views} overview has information about displaying data with
+ models and delegates.
+ \annotatedlist qtquick-views
+
+ \section2 Containers
+ These types are described in the \l{qtquick-containters}{Containers}
+ overview.
+ \annotatedlist qtquick-containers
+
+ \section1 Positioners
+ These types are described in the \l{qtquick-positioners}{Positioners}
+ overview.
+ \annotatedlist qtquick-positioners
+
+\section1 Paths
+
+ These types are described in the \l{qtquick-paths}{Paths} overview.
+ \annotatedlist qtquick-paths
+
+\section1 Utility
+
+ These types are described in the \l{qtquick-utility}{Object Utilities}
+ overview.
+ \annotatedlist qtquick-utility
+
+*/
diff --git a/src/quick/doc/src/shaders.qdoc b/src/quick/doc/src/shaders.qdoc
index 825eb29ac1..51b3abb19b 100644
--- a/src/quick/doc/src/shaders.qdoc
+++ b/src/quick/doc/src/shaders.qdoc
@@ -25,13 +25,12 @@
**
****************************************************************************/
/*!
-\page qtquick-shaders.html
-\title Shader Effects in QML
-\brief applying OpenGL vertex and fragment shaders to QML Rectangles
+\group qtquick-shaders
+\title Qt Quick Shader Effects
+\brief For applying OpenGL vertex and fragment shaders to rectangles
-\code
-NOTE: This article is a work in progress.
-\endcode
+\section1 Related Types
+\generatelist{related}
\section1 Shaders
Describe Shaders and where it could be used in UIs or applications
diff --git a/src/quick/doc/src/sprites.qdoc b/src/quick/doc/src/sprites.qdoc
index e59b30855e..377abe86c0 100644
--- a/src/quick/doc/src/sprites.qdoc
+++ b/src/quick/doc/src/sprites.qdoc
@@ -26,11 +26,15 @@
****************************************************************************/
/*!
-\page qtquick-spriteengine.html
+\group qtquick-images-sprites
\ingroup qml-features
\title Sprite Animations
\brief Sprite-based animations with flexible transitioning
+\section1 Related Types
+
+\generatelist{related}
+
\section1 Sprite Engine
The QtQuick sprite engine is a stochastic state machine combined with the ability
@@ -151,7 +155,7 @@ Cmd-line tool:
http://www.imagemagick.org/script/montage.php
-\section2 Elements Using the Sprite Engine
+\section2 QML Types Using the Sprite Engine
Sprites for the sprite engine can be defined using the \l Sprite element. This element includes the input parameters
as well as the length of the animation and weighted transitions to other animations. It is purely a data class, and
diff --git a/src/quick/doc/src/states.qdoc b/src/quick/doc/src/states.qdoc
index cc42adfb82..ac7c45bb3b 100644
--- a/src/quick/doc/src/states.qdoc
+++ b/src/quick/doc/src/states.qdoc
@@ -26,22 +26,14 @@
****************************************************************************/
/*!
-\page qtquick-states.html
+\group qtquick-states
\title Qt Quick States
\brief Creating and setting states
-\target qmlstates
-\section1 States Elements
-\list
-\li \l State
-\li \l PropertyChanges
-\li \l StateGroup
-\li \l StateChangeScript
-\li \l ParentChange
-\li \l AnchorChanges
-\endlist
+\section1 Related Types
+\generatelist{related}
-Many user interface designs are \e state driven; interfaces have configurations
+Many user interface designs are \e{state driven}; interfaces have configurations
that differ depending on the current state. For example, a traffic signal will
configure its flags or lights depending on its state. While in the signal's
\c stop state, a red light will turn on while the yellow and the green lights
diff --git a/src/quick/doc/src/texthandling.qdoc b/src/quick/doc/src/texthandling.qdoc
new file mode 100644
index 0000000000..2628776ca3
--- /dev/null
+++ b/src/quick/doc/src/texthandling.qdoc
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-text
+\title Qt Quick Text Handling and Validators
+\brief Text display, input, and validation
+
+\section1 Text Visual Types
+
+Qt Quick provides several types to display text onto the screen. The \l Text
+type will display formatted text onto the screen, the \l TextEdit type
+will place a multiline line edit onto the screen, and the \l TextInput will
+place a single editable line field onto the screen.
+
+\generatelist{related}
+
+To learn more about their specific features and properties, visit their
+respective documentation.
+
+\section1 Validating Input Text
+
+The \e validator types enforce the type and format of
+\l TextInput objects.
+
+\annotatedlist qtquick-text-validator
+
+\snippet doc/snippets/qml/texthandling.qml int validator
+The validator types bind to \c {TextInput}'s \c validator property.
+
+\snippet doc/snippets/qml/texthandling.qml regexp validator
+The regular expression in the snippet will only allow the inputted text to be
+\c {fruit basket}.
+
+Note that QML parses JavaScript regular expressions, while Qt's
+\l {QRegExp} class' regular expressions are based on Perl regular expressions.
+
+*/
+
+/*!
+\group qtquick-text-validator
+\title Qt Quick Text Validators
+\brief Types that validate text input
+
+The \l{Qt Quick Text Handling and Validators} page has information about
+validating user text input.
+*/
diff --git a/src/quick/doc/src/transformations.qdoc b/src/quick/doc/src/transformations.qdoc
new file mode 100644
index 0000000000..5bd4d832c0
--- /dev/null
+++ b/src/quick/doc/src/transformations.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-transformations
+\title Qt Quick Transformation Types
+\brief Types for applying transformations to visual types
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/uicreation.qdoc b/src/quick/doc/src/uicreation.qdoc
index 8757c30c01..51ed521625 100644
--- a/src/quick/doc/src/uicreation.qdoc
+++ b/src/quick/doc/src/uicreation.qdoc
@@ -53,9 +53,9 @@ import QtQuick.XmlListModel 2.0
\section1 Graphics and Special Effects
\list
\li \l{Basic Elements}{Basic Elements}
- \li \l{Painting with Canvas API}
+ \li \l{qtquick-canvas}{Painting with Canvas API}
\li \l{Using the Qt Quick Particle System}{Particle Effects}
- \li \l{Shader Effects in QML}{Shader Effects}
+ \li \l{qtquick-shaders}{Shader Effects}
\endlist
\section1 Anchoring and Layouts
diff --git a/src/quick/doc/src/utility.qdoc b/src/quick/doc/src/utility.qdoc
new file mode 100644
index 0000000000..c43c303994
--- /dev/null
+++ b/src/quick/doc/src/utility.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-utility
+\title Qt Quick Object Utilities
+\brief Types for managing objects
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/views.qdoc b/src/quick/doc/src/views.qdoc
new file mode 100644
index 0000000000..a27625ec62
--- /dev/null
+++ b/src/quick/doc/src/views.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-views
+\title Qt Quick Views
+\brief Presenting data in a view
+
+\section1 Related Types
+\generatelist{related}
+*/
diff --git a/src/quick/doc/src/visualtypes.qdoc b/src/quick/doc/src/visualtypes.qdoc
new file mode 100644
index 0000000000..a16c0a19c6
--- /dev/null
+++ b/src/quick/doc/src/visualtypes.qdoc
@@ -0,0 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+\group qtquick-visual-types
+\title Qt Quick Visual Types
+\brief Visible items in a scene
+
+\section1 Related Types
+\generatelist{related}
+*/