summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdatastream
diff options
context:
space:
mode:
authorIain <qt-info@nokia.com>2009-06-04 15:23:03 (GMT)
committerIain <qt-info@nokia.com>2009-06-04 15:23:03 (GMT)
commitaa081e40af9f3dd7b7e9a47e062f7784e0dbb515 (patch)
tree795ebd361f31956ac7ab5f8b850ec51ed7338dd0 /tests/auto/qdatastream
parent2b6dda723b168b3379684bc89b128ea1e792eddf (diff)
parent422905e301394dfd23b59a09ac9a725803ddf4e4 (diff)
downloadQt-aa081e40af9f3dd7b7e9a47e062f7784e0dbb515.zip
Qt-aa081e40af9f3dd7b7e9a47e062f7784e0dbb515.tar.gz
Qt-aa081e40af9f3dd7b7e9a47e062f7784e0dbb515.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'tests/auto/qdatastream')
-rw-r--r--tests/auto/qdatastream/tst_qdatastream.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qdatastream/tst_qdatastream.cpp b/tests/auto/qdatastream/tst_qdatastream.cpp
index 544c8c3..93f2b18 100644
--- a/tests/auto/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/qdatastream/tst_qdatastream.cpp
@@ -469,7 +469,7 @@ void tst_QDataStream::writeQString(QDataStream* s)
{
QString test(QStringData(dataIndex(QTest::currentDataTag())));
*s << test;
- *s << QString("Faen her spyr man");
+ *s << QString("Her er det noe tekst");
*s << test;
*s << QString();
*s << test;
@@ -487,7 +487,7 @@ void tst_QDataStream::readQString(QDataStream *s)
*s >> S;
QCOMPARE(S, test);
*s >> S;
- QCOMPARE(S, QString("Faen her spyr man"));
+ QCOMPARE(S, QString("Her er det noe tekst"));
*s >> S;
QCOMPARE(S, test);
*s >> S;
@@ -540,7 +540,7 @@ void tst_QDataStream::writeQRegExp(QDataStream* s)
{
QRegExp test(QRegExpData(dataIndex(QTest::currentDataTag())));
*s << test;
- *s << QString("Faen her spyr man");
+ *s << QString("Her er det noe tekst");
*s << test;
*s << QString("nonempty");
*s << test;
@@ -557,7 +557,7 @@ void tst_QDataStream::readQRegExp(QDataStream *s)
*s >> R;
QCOMPARE(R, test);
*s >> S;
- QCOMPARE(S, QString("Faen her spyr man"));
+ QCOMPARE(S, QString("Her er det noe tekst"));
*s >> R;
QCOMPARE(R, test);
*s >> S;