diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-21 16:39:56 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-21 16:39:56 (GMT) |
| commit | 1d054b71a4a97d197f345e100e1dc9ed8712199a (patch) | |
| tree | b2385d4b056b4bea002965319d1eda8d9b7a9589 /doc/src/declarative/qtquick-intro.qdoc | |
| parent | 8cc0e2327eaffb14c135f229d49386f61f1e1cae (diff) | |
| parent | d8b3a29279ff71a6415074872ec97dad6622c03d (diff) | |
| download | Qt-1d054b71a4a97d197f345e100e1dc9ed8712199a.zip Qt-1d054b71a4a97d197f345e100e1dc9ed8712199a.tar.gz Qt-1d054b71a4a97d197f345e100e1dc9ed8712199a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/index.qdoc
doc/src/mainpage.qdoc
Diffstat (limited to 'doc/src/declarative/qtquick-intro.qdoc')
| -rw-r--r-- | doc/src/declarative/qtquick-intro.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/declarative/qtquick-intro.qdoc b/doc/src/declarative/qtquick-intro.qdoc index 1bbae8f..02b2c44 100644 --- a/doc/src/declarative/qtquick-intro.qdoc +++ b/doc/src/declarative/qtquick-intro.qdoc @@ -109,7 +109,7 @@ system. \section1 Where to Go from Here -The \l {Qt Quick} page has links to various Qt Quick topics such as QML +The \l {Qt Quick} page has links to various Qt Quick topics such as QML features, addons, and tools. The \l {QML Examples and Demos} page has a gallery of QML applications. |