summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-07-14 05:02:33 (GMT)
committerToby Tomkins <toby.tomkins@nokia.com>2010-07-15 03:23:07 (GMT)
commit3d982368945fbbf5c3b5a1846c32292e3e9b6ab4 (patch)
tree672c6f147e9978737a0738104303b117aced12de /doc
parent7fa2c9f5b53e57b0adb50f765805935c19ec703f (diff)
downloadQt-3d982368945fbbf5c3b5a1846c32292e3e9b6ab4.zip
Qt-3d982368945fbbf5c3b5a1846c32292e3e9b6ab4.tar.gz
Qt-3d982368945fbbf5c3b5a1846c32292e3e9b6ab4.tar.bz2
Distinguish Qt Quick, Qt Declarative and QML on the landing page
Task-number: QTBUG-11916 (cherry picked from commit d7a1e01e9970bef56f647873bb2a3496893b775a)
Diffstat (limited to 'doc')
-rw-r--r--doc/src/declarative/declarativeui.qdoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 4235c27..e9a039b 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -37,7 +37,9 @@ custom user interfaces from a rich set of \l {QML Elements}{QML elements}.
Qt Quick helps programmers and designers collaborate to
build the fluid user interfaces that are becoming common in portable
consumer devices, such as mobile phones, media players, set-top boxes
-and netbooks.
+and netbooks. Qt Quick consists of the QtDeclarative C++ module, QML, and
+the integration of both of these into the Qt Creator IDE. Using the QtDeclarative
+C++ module, you can load and interact with QML files from your Qt application.
QML is an extension to \l
{http://www.ecma-international.org/publications/standards/Ecma-262.htm}
@@ -58,7 +60,7 @@ complete internet-enabled applications like a \l
Qt Quick builds on \l {QML for Qt programmers}{Qt's existing
strengths}. QML can be be used to incrementally extend an existing
application or to build completely new applications. QML is fully \l
-{Extending QML in C++}{extensible from C++}.
+{Extending QML in C++}{extensible from C++} through the QtDeclarative Module.
\section1 Getting Started