diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-08-18 08:32:04 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-08-18 08:32:04 (GMT) |
| commit | 06524f769fec76fa7ebcc39ac88ac9e08c720677 (patch) | |
| tree | a14448b17d6a8e1104d8471bee0948de4572df84 /doc/src/snippets/code | |
| parent | 1428cc6d71a65c1ac7123c9c4cc3cfaf225cceed (diff) | |
| parent | ff96a87389d69a537a91d364b299aae09c2129a6 (diff) | |
| download | Qt-06524f769fec76fa7ebcc39ac88ac9e08c720677.zip Qt-06524f769fec76fa7ebcc39ac88ac9e08c720677.tar.gz Qt-06524f769fec76fa7ebcc39ac88ac9e08c720677.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_qalgorithms.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_qtmultimedia.qdoc | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/src/snippets/code/doc_src_qalgorithms.qdoc b/doc/src/snippets/code/doc_src_qalgorithms.qdoc index 69d943c..e2126dd 100644 --- a/doc/src/snippets/code/doc_src_qalgorithms.qdoc +++ b/doc/src/snippets/code/doc_src_qalgorithms.qdoc @@ -302,7 +302,7 @@ list.clear(); QList<int> list; list << 33 << 12 << 68 << 6 << 12; qSort(list.begin(), list.end(), qLess<int>()); -// list: [ 68, 33, 12, 12, 6 ] +// list: [ 6, 12, 12, 33, 68 ] //! [24] diff --git a/doc/src/snippets/code/doc_src_qtmultimedia.qdoc b/doc/src/snippets/code/doc_src_qtmultimedia.qdoc new file mode 100644 index 0000000..87a03a4 --- /dev/null +++ b/doc/src/snippets/code/doc_src_qtmultimedia.qdoc @@ -0,0 +1,8 @@ +//! [0] +QT += multimedia +//! [0] + + +//! [1] +#include <QtMultimedia> +//! [1] |