diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 09:37:17 +0200 |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 09:37:17 +0200 |
| commit | 76d680844382ea24d40caaf9e0349e7b5af69ada (patch) | |
| tree | 624744baeccc3948b4583d812d77bce4a0879110 /doc/src/declarative | |
| parent | 5cd6323211aac99599f38a6c7363ae52b2b5bd02 (diff) | |
| parent | d448205c2e7ae31ae0814696c2c1d38ff56385bd (diff) | |
| download | qt4-tools-76d680844382ea24d40caaf9e0349e7b5af69ada.tar.gz | |
Merge remote branch 'qt-doc-review/master'
Conflicts:
doc/src/declarative/righttoleft.qdoc
tools/qdoc3/generator.h
Diffstat (limited to 'doc/src/declarative')
| -rw-r--r-- | doc/src/declarative/declarativeui.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/declarative/qtquick-intro.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc index cecccf6254..d89ca53dbb 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/doc/src/declarative/declarativeui.qdoc @@ -46,7 +46,7 @@ Qt applications. \section1 Getting Started \list -\o \l{Introduction to Qt Quick} +\o \l{Intro to Qt Quick}{Introduction to Qt Quick} \o \l{QML for Qt Programmers}{QML Programming for Qt Programmers} \o \l{Getting Started Programming with QML} diff --git a/doc/src/declarative/qtquick-intro.qdoc b/doc/src/declarative/qtquick-intro.qdoc index 4cd5db3867..bdad2c3047 100644 --- a/doc/src/declarative/qtquick-intro.qdoc +++ b/doc/src/declarative/qtquick-intro.qdoc @@ -27,7 +27,7 @@ /*! \page qml-intro.html -\title Introduction to Qt Quick +\title Intro to Qt Quick Qt Quick is a collection of technologies that are designed to help developers create the kind of intuitive, modern, and fluid user interfaces that are |