summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-14 10:01:09 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-14 10:01:09 (GMT)
commit6a8f901d6545a3c68bc398150b641694b68ddf0a (patch)
tree07841339fb9f83970f62733a2adb346f0aad36ca /doc/src
parentedcc782002c8b93e60dabfc0859c209a4eeedf10 (diff)
parent2fc228b4d2fbe6ca44389e9e065272030775c87b (diff)
downloadQt-6a8f901d6545a3c68bc398150b641694b68ddf0a.zip
Qt-6a8f901d6545a3c68bc398150b641694b68ddf0a.tar.gz
Qt-6a8f901d6545a3c68bc398150b641694b68ddf0a.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/qt4-intro.qdoc5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index e37d327..cecff0e 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -664,9 +664,10 @@
See the \l{QtMultimedia Module} documentation for more information.
- \section1 Classes, functions, etc new in 4.6
+ \section1 New Classes, Functions, Macros, etc
- Links to classes, functions, and other items that are new in 4.6.
+ Links to new classes, functions, macros, and other items
+ introduced in Qt 4.6.
\sincelist 4.6