summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextcodec
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-03 11:46:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-03 11:46:09 (GMT)
commit1d5041c712acd10020c38a92f1eedc88368ca19f (patch)
treefb2d4e31c8232456d10bd70a67000076c8d2d48a /tests/auto/qtextcodec
parent68ad4618e02d1686e37b979fbf1fd1f349aa6d4f (diff)
parent7f5797a784e237672f291055020ef4bbb6199893 (diff)
downloadQt-4.8.0-beta.zip
Qt-4.8.0-beta.tar.gz
Qt-4.8.0-beta.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integrationv4.8.0-beta
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixing typo
Diffstat (limited to 'tests/auto/qtextcodec')
-rw-r--r--tests/auto/qtextcodec/tst_qtextcodec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index 049af79..4813f90 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -496,7 +496,7 @@ void tst_QTextCodec::flagEFBFBF() const
start.append("?>");
}
- /* When 0xEFBFBF is preceeded by what seems to be an arbitrary character,
+ /* When 0xEFBFBF is preceded by what seems to be an arbitrary character,
* QTextCodec fails to flag it. */
{
QByteArray start("B");