summaryrefslogtreecommitdiffstats
path: root/doc/src/qt4-intro.qdoc
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-08-26 21:42:57 (GMT)
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-08-26 21:42:57 (GMT)
commite028a54690f2fedfae6da19fb24b7401e4a71e56 (patch)
tree72c038e84d9fb1063c970a121949d898442c5648 /doc/src/qt4-intro.qdoc
parentd54407928be05781ede2358baba2f2f91749cc80 (diff)
parent6661f5c2222c145d854e225076195b37672637d2 (diff)
downloadQt-e028a54690f2fedfae6da19fb24b7401e4a71e56.zip
Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.gz
Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts: doc/src/index.qdoc src/xmlpatterns/expr/qevaluationcache_p.h
Diffstat (limited to 'doc/src/qt4-intro.qdoc')
-rw-r--r--doc/src/qt4-intro.qdoc3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 01103a8..17dc1af 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -138,7 +138,7 @@
In Qt 4.4:
\list
- \o \l{WebKit in Qt}{Qt WebKit integration}, making it possible for developers
+ \o \l{Webkit in QT}{Qt WebKit integration}, making it possible for developers
to use a fully-featured Web browser to display documents and access online
services.
\o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}.
@@ -707,6 +707,7 @@
introduced in Qt 4.7.
\sincelist 4.7
+
*/
/*!