aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2012-08-24 13:12:42 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-24 05:14:04 +0200
commitacf5251f855c8af7cd27776ecb1c9c7370b066bb (patch)
tree3c4cac15dc62e67d4d914c50453874727d207c5e /src
parent8fe246768fb5305b64810bff8ce8b21e2234e4e1 (diff)
Fix doc links
Change-Id: Iafbcd39472f3e6f12169ae1a17b4a040dbb9a8a4 Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/doc/src/qtqml.qdoc2
-rw-r--r--src/quick/doc/src/appdevguide/qml-intro.qdoc13
-rw-r--r--src/quick/doc/src/qmltypereference.qdoc2
3 files changed, 9 insertions, 8 deletions
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 1dc23fa76c..c13ed4395b 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -93,7 +93,7 @@ for an introduction to writing QML applications.
\li \l{qtqml-documents-topic.html}{QML Documents}
\list
\li \l{qtqml-documents-structure.html}{Structure of a QML Document}
- \li \l{qtqml-main.html#syntax-of-the-qml-language}{Syntax of the QML Language}
+ \li \l{Syntax of the QML Language}
\li \l{qtqml-documents-definetypes.html}{Defining Object Types through QML Documents}
\list
\li \l{qtqml-documents-definetypes.html#defining-an-object-type-with-a-qml-file}{Defining an Object Type with a QML File}
diff --git a/src/quick/doc/src/appdevguide/qml-intro.qdoc b/src/quick/doc/src/appdevguide/qml-intro.qdoc
index e96fafb6cb..5eb1031b26 100644
--- a/src/quick/doc/src/appdevguide/qml-intro.qdoc
+++ b/src/quick/doc/src/appdevguide/qml-intro.qdoc
@@ -90,10 +90,11 @@ this simple example.
\section1 Importing Modules
-The \c import statement imports the \l{qtquick-main.html}{QtQuick}
-\l{qtqml-modules-topic.html}{module}, which contains all of the standard
-QML types. Without this import statement, the \l Rectangle and
-other visual object types would not be available.
+The \c import statement imports the QtQuick module, which contains all of the
+standard QML types. A \l{qtqml-modules-topic.html}{module} makes a particular
+set of types available to the QML code that imports it; without this import
+statement, the \l Rectangle and other visual object types would not be
+available.
A specific version of a module is imported. This guarantees that the
QML types imported when the application is run by the user match those
@@ -1274,10 +1275,10 @@ page contains the most important information for QML application developers.
{Developing Qt Quick Applications with Creator} provides an overview
of user interface development using the visual \e{Qt Quick Designer} tool.
-The \l{qtqml-main.html}{Qt QML module} documentation contains in-depth
+The \l {QtQml}{Qt QML module} documentation contains in-depth
information about the QML language and the concepts behind QML.
-The \l{qtquick-main.html}{Qt Quick module} documentation contains in-depth
+The \l {QtQuick}{Qt Quick module} documentation contains in-depth
information about the QML types and functionality provided by Qt Quick,
which forms the basis for user-interfaces developed in QML.
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc
index cdccb27135..69c16a4457 100644
--- a/src/quick/doc/src/qmltypereference.qdoc
+++ b/src/quick/doc/src/qmltypereference.qdoc
@@ -47,7 +47,7 @@ imported via the following statement:
import QtQuick 2.0
\endqml
-See the \l{qtquick-main.html}{QtQuick} module documentation for more
+See the QtQuick module documentation for more
information about the concepts which are central to \c QtQuick.
\section1 Basic Types