diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 09:38:52 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-31 09:39:36 +0200 |
| commit | 0e10b8dbb7d84694cbdeb57bf42df52b12d79f47 (patch) | |
| tree | e0968185c3afce109537977c9eb0df4cfd8f6cb7 /doc/src/declarative | |
| parent | ac51ebee5bcc975829cf59012dfe9bb198016ed1 (diff) | |
| parent | 5a9000c3aca05e28c4fc537f82d85d6ec4395dc5 (diff) | |
| download | qt4-tools-0e10b8dbb7d84694cbdeb57bf42df52b12d79f47.tar.gz | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
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 d89ca53dbb..cecccf6254 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{Intro to Qt Quick}{Introduction to Qt Quick} +\o \l{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 bdad2c3047..4cd5db3867 100644 --- a/doc/src/declarative/qtquick-intro.qdoc +++ b/doc/src/declarative/qtquick-intro.qdoc @@ -27,7 +27,7 @@ /*! \page qml-intro.html -\title Intro to Qt Quick +\title Introduction 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 |