aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/qtquick.qdoc
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@nokia.com>2012-08-13 15:16:51 +0200
committerQt by Nokia <qt-info@nokia.com>2012-08-23 06:23:55 +0200
commit540092608b26c469d4905d3c673374542cc32940 (patch)
tree2bf555ee92410bd1d498d37a70402ca04f13ce00 /src/quick/doc/src/qtquick.qdoc
parent453cedc87b91fb10ae9a7cd91aa1d35061d9ed2c (diff)
Doc: Tidied links, titles, and HTML pages.
-used "Qt Quick" and "Qt QML" to refer to the module -qtquick-index.html and qtqml-index.html for the landing pages Change-Id: I1569949f7875ac6008a5b80a169e327f93f330ae Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/quick/doc/src/qtquick.qdoc')
-rw-r--r--src/quick/doc/src/qtquick.qdoc34
1 files changed, 12 insertions, 22 deletions
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index 45a4b7684d..a70f2de31b 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -26,14 +26,12 @@
****************************************************************************/
/*!
-\page qtquick-main.html
-\title Qt Quick Module
+\page qtquick-index.html
+\title Qt Quick
\brief The Qt Quick module implements the "standard library" for QML
-\section1 Overview of the Qt Quick Module
-
The Qt Quick module is the standard library for writing QML applications.
-While the \l{qtqml-main.html}{Qt QML module} provides the QML engine and
+While the \l{Qt QML} module provides the QML engine and
language infrastructure, the Qt Quick module provides all the basic
elements necessary for creating user interfaces with QML. It
provides a visual canvas and includes types for creating and animating
@@ -41,13 +39,13 @@ visual components, receiving user input, creating data models and views
and delayed object instantiation.
The Qt Quick module provides both the \c QtQuick QML module, which supplies
-\l{qtquick-qmltypereference.html}{a set of QML types} for creating user
-interfaces with the QML language, and the QtQuick C++ module, which supplies
-\l{QtQuick}{a set of C++ APIs} for integrating with user interfaces and
+\l{QML Types Provided by Qt Quick}{a set of QML types} for creating user
+interfaces with the QML language, and the \c QtQuick C++ module, which supplies
+\l{Qt Quick Module - C++ Classes}{a set of C++ APIs} for integrating with user interfaces and
applications built with QML and the \c QtQuick QML module.
For those new to QML and Qt Quick, please see
-\l{qtquick-applicationdevelopers.html}{QML Application Developer Resources}
+\l{QML Application Developer Resources}
for an introduction to writing QML applications.
@@ -110,20 +108,12 @@ To find out more about using the QML language, see the \l{Qt QML Module Document
\section1 Reference Documentation
-Additional Qt Quick information:
-\list
-\li \l{QtQuick}{QtQuick Module C++ API Reference} - the C++ API provided by the
- Qt Quick module
-\li \l{qtquick-releasenotes.html}{QtQuick Release Notes} - list of changes and
- additions in the Qt Quick module
-\endlist
-
-Further information for writing QML applications:
\list
-\li \l{qtquick-applicationdevelopers.html}{QML Application Developer Resources}
- - essential information for application development with QML and Qt Quick
-\li \l{qtqml-main.html}{Qt QML Module Documentation} - documentation for the
- Qt QML module, which provides the QML engine and language infrastructure
+\li \l{QML Types Provided by Qt Quick}
+\li \l{Qt Quick Module - C++ Classes}
+\li \l{Qt QML} module documentation
+\li \l{QML Application Developer Resources} - information for application development with QML and Qt Quick
+\li \l{Qt Quick Release Notes}
\endlist
*/