summaryrefslogtreecommitdiffstats
path: root/doc/src/porting/porting4.qdoc
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-17 13:58:48 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-17 13:58:48 (GMT)
commitff6f17c92ad1bfa898bc89a5ccb65361d443c591 (patch)
treef0ac9ead3755b886975dada5c977e969600526fd /doc/src/porting/porting4.qdoc
parentcd1b5d933575fb801ad3014f3d7fd7c268a362d1 (diff)
parent1970e2d46656db8178636e06c82287f536b626c7 (diff)
downloadQt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.zip
Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.gz
Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'doc/src/porting/porting4.qdoc')
-rw-r--r--doc/src/porting/porting4.qdoc4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc
index 0bbf35f..7b80e13 100644
--- a/doc/src/porting/porting4.qdoc
+++ b/doc/src/porting/porting4.qdoc
@@ -2598,7 +2598,7 @@
seems feeble.
\endomit
- See \l{Generic Containers} for a list of Qt 4 containers.
+ See \l{Container Classes} for a list of Qt 4 containers.
\section1 QPtrDict<T>
@@ -3939,7 +3939,7 @@
check the index against QVector::size() yourself.
\endlist
- See \l{Generic Containers} for an overview of the Qt 4 container
+ See \l{Container Classes} for an overview of the Qt 4 container
classes.
\section1 QVariant