From 95e2bf3d87543da8caabd090057da818ccf2ca4c Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 14 Apr 2011 11:26:28 +0200 Subject: 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 --- tests/auto/qstringbuilder1/stringbuilder.cpp | 3 --- 1 file changed, 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 } -- cgit v0.12