aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc/src/appdevguide
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/appdevguide
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/appdevguide')
-rw-r--r--src/quick/doc/src/appdevguide/applicationdevelopers.qdoc15
-rw-r--r--src/quick/doc/src/appdevguide/glossary.qdoc2
-rw-r--r--src/quick/doc/src/appdevguide/qmlscene.qdoc2
3 files changed, 9 insertions, 10 deletions
diff --git a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
index ca810f92ae..4305506cb7 100644
--- a/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
+++ b/src/quick/doc/src/appdevguide/applicationdevelopers.qdoc
@@ -52,7 +52,7 @@ user interfaces in QML, and have the option of connecting these user
interfaces to any back-end C++ libraries.
This page links to all the information you need to start developing
-applications with QML and QtQuick.
+applications with \l{Qt QML}{QML} and \l{Qt Quick}.
\section2 Other QML modules
@@ -112,7 +112,7 @@ expressions combined with dynamic property bindings.
The QML language and engine infrastructure is provided by the Qt QML module.
For in-depth information about the QML language, please see the
-\l{qtqml-main.html}{Qt QML Module Documentation}.
+\l{Qt QML} module documentation.
\section2 What is Qt Quick?
@@ -121,10 +121,9 @@ includes visual elements, interactive elements, animations, models and views,
particle effects and shader effects. A QML application developer can get
access to all of that functionality with a single import statement.
-The QtQuick QML library is provided by the Qt Quick module.
+The \c QtQuick QML library is provided by the \l{Qt Quick} module.
For in-depth information about the various QML types and other functionality
-provided by Qt Quick, please see the \l{qtquick-main.html}
-{Qt Quick Module Documentation}.
+provided by Qt Quick, please see the \l{Qt Quick} module documentation.
\section1 Advanced Application Development Topics
@@ -144,9 +143,9 @@ provided by Qt Quick, please see the \l{qtquick-main.html}
\section1 Release Notes and Porting Guides
\list
-\li \l{qtqml-releasenotes.html}{QtQml Module Release Notes}
-\li \l{qtquick-releasenotes.html}{QtQuick Module Release Notes}
-\li \l{qtquick-porting-qt5.html}{Porting QML Applications to Qt 5}
+\li \l{Qt QML Release Notes}
+\li \l{Qt Quick Release Notes}
+\li \l{Porting QML Applications to Qt 5}
\endlist
*/
diff --git a/src/quick/doc/src/appdevguide/glossary.qdoc b/src/quick/doc/src/appdevguide/glossary.qdoc
index a3b6db8a14..9fb7bef5a9 100644
--- a/src/quick/doc/src/appdevguide/glossary.qdoc
+++ b/src/quick/doc/src/appdevguide/glossary.qdoc
@@ -27,7 +27,7 @@
/*!
\page qtquick-glossary.html
-\title Glossary Of Terms
+\title Qt Quick Glossary Of Terms
\brief Glossary of terms used in the documentation for QML and QtQuick
\section1 Common Terms
diff --git a/src/quick/doc/src/appdevguide/qmlscene.qdoc b/src/quick/doc/src/appdevguide/qmlscene.qdoc
index 7ca404585d..759ece897e 100644
--- a/src/quick/doc/src/appdevguide/qmlscene.qdoc
+++ b/src/quick/doc/src/appdevguide/qmlscene.qdoc
@@ -28,7 +28,7 @@
/*!
\page qtquick-qmlscene.html
\ingroup qtquick-tools
-\title Protoyping with qmlscene
+\title Prototyping with qmlscene
\ingroup qttools
\brief a tool for testing and loading QML files