diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-08-11 08:07:59 (GMT) |
| commit | 02e0523fe2b1dfd08eadaf127023306f6aa64c6f (patch) | |
| tree | 26f374407ac0976e69f092517d69e1c93332492c /doc/src/porting/porting4.qdoc | |
| parent | d501b04974df3615ac12fa93e11e893a44fbe715 (diff) | |
| parent | c7a18308a2725e4d1763777cb549f1ae74848005 (diff) | |
| download | Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.zip Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.gz Qt-02e0523fe2b1dfd08eadaf127023306f6aa64c6f.tar.bz2 | |
Merge commit 'remotes/origin/4.7' into qt47s2
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
Diffstat (limited to 'doc/src/porting/porting4.qdoc')
| -rw-r--r-- | doc/src/porting/porting4.qdoc | 4 |
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 |