diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-31 13:11:55 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-31 13:11:55 (GMT) |
| commit | 8b916347634f2dcbb7d3e7c26a72879bee711012 (patch) | |
| tree | 4b8fb2eca866c818b9ca07de63f7235a9f04013a /tests/auto/qbytearray/tst_qbytearray.cpp | |
| parent | ef12918fed8c046abcb3e527cc31440b59a50c17 (diff) | |
| parent | e4dbcd65d417309c06b15f56dec31e1e0a1b0c64 (diff) | |
| download | Qt-8b916347634f2dcbb7d3e7c26a72879bee711012.zip Qt-8b916347634f2dcbb7d3e7c26a72879bee711012.tar.gz Qt-8b916347634f2dcbb7d3e7c26a72879bee711012.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qbytearray/tst_qbytearray.cpp')
| -rw-r--r-- | tests/auto/qbytearray/tst_qbytearray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qbytearray/tst_qbytearray.cpp b/tests/auto/qbytearray/tst_qbytearray.cpp index 435724a..dfb2fe1 100644 --- a/tests/auto/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/qbytearray/tst_qbytearray.cpp @@ -464,7 +464,7 @@ void tst_QByteArray::base64_data() QTest::newRow("f") << ba << QByteArray("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="); QTest::newRow("g") << QByteArray("foo\0bar", 7) << QByteArray("Zm9vAGJhcg=="); - QTest::newRow("h") << QByteArray("f\xd1oo\x9cbar") << QByteArray("ZtFvb7py"); + QTest::newRow("h") << QByteArray("f\xd1oo\x9ctar") << QByteArray("ZtFvb5x0YXI="); QTest::newRow("i") << QByteArray("\"\0\0\0\0\0\0\"", 8) << QByteArray("IgAAAAAAACI="); } @@ -514,7 +514,7 @@ void tst_QByteArray::fromBase64_data() QTest::newRow("g") << QByteArray("foo\0bar", 7) << QByteArray("Zm9vAGJhcg"); - QTest::newRow("h") << QByteArray("f\xd1oo\x9cbar") << QByteArray("ZtFv\0b7py", 9); + QTest::newRow("h") << QByteArray("f\xd1oo\x9ctar") << QByteArray("ZtFvb5x0YXI="); QTest::newRow("i") << QByteArray("\"\0\0\0\0\0\0\"", 8) << QByteArray("IgAAAAAAACI"); } |