diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-17 14:00:47 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-17 14:00:47 (GMT) |
| commit | 36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce (patch) | |
| tree | f65778c976c7ac5f1fa6fb81e8e33982f1fd2e82 /doc/src/porting | |
| parent | 86c3fed122b8a6e47904d958f8c50fa19e668434 (diff) | |
| parent | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (diff) | |
| download | Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.zip Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.gz Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.bz2 | |
Merge branch '4.7' into qmldocs
Diffstat (limited to 'doc/src/porting')
| -rw-r--r-- | doc/src/porting/porting4.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/porting/qt4-tulip.qdoc | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/doc/src/porting/qt4-tulip.qdoc b/doc/src/porting/qt4-tulip.qdoc index 08542a6..333af84 100644 --- a/doc/src/porting/qt4-tulip.qdoc +++ b/doc/src/porting/qt4-tulip.qdoc @@ -97,7 +97,7 @@ you are iterating, that won't affect the loop. For details about the new containers, see the - \l{Generic Containers} and \l{Generic Algorithms} overview documents. + \l{Container Classes} and \l{Generic Algorithms} overview documents. In addition to the new containers, considerable work has also gone into QByteArray and QString. The Qt 3 QCString class has been |