summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/declarativeui.qdoc17
-rw-r--r--doc/src/declarative/elements.qdoc2
-rw-r--r--doc/src/declarative/extending-tutorial.qdoc7
-rw-r--r--doc/src/index.qdoc2
4 files changed, 19 insertions, 9 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 8f36582..d79c4d2 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -40,19 +40,28 @@
****************************************************************************/
/*!
-\title Declarative UI (QML)
+\title Declarative UI Using QML
\page declarativeui.html
\brief The Qt Declarative module provides a declarative framework for building
highly dynamic, custom user interfaces.
+\section1 \l{QML Elements}{Fast QML Elements Reference Page}
+
+\raw HTML
+<br>
+\endraw
+
+\section1 Preamble
+
Qt Declarative UI provides a declarative framework for building highly dynamic, custom
user interfaces. Declarative UI helps programmers and designers collaborate to build
the animation rich, fluid user interfaces that are becoming common in portable
consumer devices, such as mobile phones, media players, set-top boxes and netbooks.
-The Qt Declarative module provides an engine for interpreting the declarative QML
-language, and a rich set of \l {QML Elements}{QML elements} that can be used
-from QML.
+
+The Qt Declarative module provides an engine for interpreting the declarative
+QML language, and a rich set of \bold { \l {QML Elements}{QML elements} }
+that can be used from QML.
QML is an extension to \l {http://www.ecma-international.org/publications/standards/Ecma-262.htm}
{JavaScript}, that provides a mechanism to declaratively build an object tree
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index bbe01e4..79fe909 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -44,7 +44,7 @@
\target elements
\title QML Elements
-The following table lists the QML elements provided by the Qt Declarative module.
+The following table lists the QML elements provided by the \l {QtDeclarative}{Qt Declarative} module.
\table 80%
\header
diff --git a/doc/src/declarative/extending-tutorial.qdoc b/doc/src/declarative/extending-tutorial.qdoc
index a139616..f00b858 100644
--- a/doc/src/declarative/extending-tutorial.qdoc
+++ b/doc/src/declarative/extending-tutorial.qdoc
@@ -62,7 +62,7 @@ Tutorial chapters:
\o \l{declarative/tutorials/extending/chapter2-methods}{Connecting to C++ Methods and Signals}
\o \l{declarative/tutorials/extending/chapter3-bindings}{Adding Property Bindings}
\o \l{declarative/tutorials/extending/chapter4-customPropertyTypes}{Using Custom Property Types}
-\o \l{declarative/tutorials/extending/chapter5-plugins}{Deploying Your Extension}
+\o \l{declarative/tutorials/extending/chapter5-plugins}{Writing an Extension Plugin}
\o \l{qml-extending-tutorial6.html}{In Summary}
\endlist
@@ -308,7 +308,7 @@ Try it out with the code in Qt's \c examples/tutorials/extending/chapter4-custom
*/
/*!
-\title Chapter 5: Deploying Your Extension
+\title Chapter 5: Writing an Extension Plugin
\example declarative/tutorials/extending/chapter5-plugins
@@ -316,7 +316,8 @@ Currently the \c Musician and \c Instrument types are used by \c app.qml,
which is displayed using a QDeclarativeView in a C++ application. An alternative
way to use our QML extension is to create a plugin library to make it available
to the QML engine. This means we could load \c app.qml using the standard \c qml tool
-instead of writing a \c main.cpp file and loading our own C++ application.
+(or some other QML runtime application) instead of writing a \c main.cpp file and
+loading our own C++ application.
To create a plugin library, we need:
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 2f23e6e..2e6f9bd 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -75,7 +75,7 @@
<li><a href="classes.html">All classes</a></li>
<li><a href="namespaces.html">All namespaces</a></li>
<li><a href="functions.html">All functions</a></li>
- <li><a href="platform-specific.html">Platform support &amp; speciffics</a></li>
+ <li><a href="platform-specific.html">Platform support &amp; specifics</a></li>
</ul>
</div>
<div class="sectionlist">