summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-14 09:26:28 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-14 09:26:28 (GMT)
commit95e2bf3d87543da8caabd090057da818ccf2ca4c (patch)
treeea009e17607addf1bd29761faa09d061bd6679e0
parent2da25f1ab075c8fbaf7b82fb10b4868db30a7c18 (diff)
downloadQt-95e2bf3d87543da8caabd090057da818ccf2ca4c.zip
Qt-95e2bf3d87543da8caabd090057da818ccf2ca4c.tar.gz
Qt-95e2bf3d87543da8caabd090057da818ccf2ca4c.tar.bz2
Fix qstringbuilder4 test on mac
The behaviour is different with or without QT_FAST_OPERATOR_PLUS And since on old gcc it is not defined, then the test fails. With the normal operator+, the bytearray will first be converted to a QString, and loose everything that is after \0, but now, with QStringBuilder, we do not do QString conversion anymore, so no data is lost. We do not want to specify the behaviour here, so we remove the test. Reviewed-by: Joao
-rw-r--r--tests/auto/qstringbuilder1/stringbuilder.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/qstringbuilder1/stringbuilder.cpp b/tests/auto/qstringbuilder1/stringbuilder.cpp
index 035a1f4..d7a32bf 100644
--- a/tests/auto/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/qstringbuilder1/stringbuilder.cpp
@@ -190,9 +190,6 @@ void runScenario()
ba2 = (ba += QLatin1String(LITERAL) + QString::fromUtf8(UTF8_LITERAL));
QCOMPARE(ba2, ba);
QCOMPARE(ba, QByteArray(UTF8_LITERAL LITERAL UTF8_LITERAL));
- ba = UTF8_LITERAL;
- ba += QLatin1String(LITERAL) P withZero;
- QCOMPARE(ba, QByteArray(UTF8_LITERAL LITERAL + withZero));
#endif
}