summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorBradley T. Hughes <bradley.hughes@nokia.com>2009-11-09 10:46:57 (GMT)
committerBradley T. Hughes <bradley.hughes@nokia.com>2009-11-09 10:46:57 (GMT)
commit683cca297d29e7ea9f84c087a3c081dcccea48fb (patch)
tree88ca39218e1fedf94751b927d7e04944a4c66e16 /doc/src/snippets/code
parent338fe3c15e90d62606806b0845bb621dd05153ae (diff)
parentfa7f6e542b8381dd3af525507cd6e0a3ee43b813 (diff)
downloadQt-683cca297d29e7ea9f84c087a3c081dcccea48fb.zip
Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.gz
Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts: src/gui/kernel/qwidget_win.cpp
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/src_corelib_tools_qbytearray.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index e87408a..52fbd1a 100644
--- a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -234,7 +234,7 @@ ba.indexOf("X"); // returns -1
//! [23]
QByteArray x("crazy azimuths");
-QByteArray y("azy");
+QByteArray y("az");
x.lastIndexOf(y); // returns 6
x.lastIndexOf(y, 6); // returns 6
x.lastIndexOf(y, 5); // returns 2