summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-10-27 15:05:59 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-10-27 15:05:59 (GMT)
commit7ca94a08b9c232aaccb74fa85912515b8f9a6619 (patch)
treee60229477bc8269cf14904620bf0fc5ad18ef6d0 /doc
parentf8c9314d6224948c28487e291b4cdad0049682c7 (diff)
parent7285c09ef777569514e73dffa22ecfdb7df6ba8f (diff)
downloadQt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.zip
Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.gz
Qt-7ca94a08b9c232aaccb74fa85912515b8f9a6619.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
-rw-r--r--doc/src/snippets/code/src_qtestlib_qtestcase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/snippets/code/src_qtestlib_qtestcase.cpp b/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
index c9bda61..6ae8939 100644
--- a/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
+++ b/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
@@ -48,7 +48,7 @@ QVERIFY(1 + 1 == 2);
//! [1]
-QVERIFY2(1 + 1 == 2, "A breach in basic arithmetic occured.");
+QVERIFY2(1 + 1 == 2, "A breach in basic arithmetic occurred.");
//! [1]