diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-22 11:27:57 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-22 11:27:57 (GMT) |
| commit | cf1f76661613313615a77479687fa93a3c97efc9 (patch) | |
| tree | 978b8d1117224773952d1d2782d7825920bfc6ed /doc/src/declarative/declarativeui.qdoc | |
| parent | d8908922f339892fee4275a433e2bf6da87ae055 (diff) | |
| parent | be227b0a01bb28f3ebebedc1aaa65cd8098edd81 (diff) | |
| download | Qt-cf1f76661613313615a77479687fa93a3c97efc9.zip Qt-cf1f76661613313615a77479687fa93a3c97efc9.tar.gz Qt-cf1f76661613313615a77479687fa93a3c97efc9.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'doc/src/declarative/declarativeui.qdoc')
| -rw-r--r-- | doc/src/declarative/declarativeui.qdoc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index cd27c40..217e372 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 |