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/howtos | |
| 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/howtos')
| -rw-r--r-- | doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/howtos/scalabilityintro.qdoc | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc b/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc index e33ee13..ac3669d 100644 --- a/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc +++ b/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc @@ -90,8 +90,8 @@ Similar to JavaScript or C++, there are two ways of commenting QML code: \section1 Group Properties -Many QML properties are \l{attached-properties}{attached} or -\l {qml-grouped-properties}{group} properties. For convenience, you may treat +Many QML properties are \l{attached-properties}{attached} or +\l {qml-grouped-properties}{group} properties. For convenience, you may treat them as another element when dealing with multiple properties belonging to the same group. diff --git a/doc/src/howtos/scalabilityintro.qdoc b/doc/src/howtos/scalabilityintro.qdoc index 1abdc7a..d9c5658 100644 --- a/doc/src/howtos/scalabilityintro.qdoc +++ b/doc/src/howtos/scalabilityintro.qdoc @@ -24,6 +24,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ + /*! \title Scalability \page scalability.html |