diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-19 03:39:36 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-19 03:39:36 (GMT) |
| commit | 2ca4d08efc444de985a9a7749e771dfcaa0e7683 (patch) | |
| tree | de821643167f835cea5a4cb133d32775d4d77784 /doc/src/snippets/code | |
| parent | 84b76c452833f52891593f317a64bc78c7486bbf (diff) | |
| parent | e19fa69859c1abe8da0623c502d012cff214e1c4 (diff) | |
| download | Qt-2ca4d08efc444de985a9a7749e771dfcaa0e7683.zip Qt-2ca4d08efc444de985a9a7749e771dfcaa0e7683.tar.gz Qt-2ca4d08efc444de985a9a7749e771dfcaa0e7683.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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] |