QString: preserve embedded NULs when converting from QByteArray

Unearthed an off-by-one error in a QByteArray::fromRawData() call in
tst_qtextdocumentfragment. Fixed by porting to QStringLiteral.

[ChangeLog][Important Behavior Changes] All conversions from QByteArray
to QString now preserve embedded NULs. This is done in order to provide a
faster conversion from QByteArray to QString that does not involve a call to
strlen. If you need the old behavior, convert from QByteArray::constData()
instead. If you are porting from Qt 4, we suggest to make your source compile
with QT_NO_CAST_FROM_BYTEARRAY before porting to Qt 5.

Change-Id: Ibca40f503920fee6f3a5f0d74a04b38b8849796f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 2 insertions, 37 deletions

diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index c3dbb26587..647a75ceb2 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -828,7 +828,7 @@ void tst_QString::constructorQByteArray_data()
     ba1[5] = 'e';
     ba1[6] = 'f';
 
-    QTest::newRow( "2" ) << ba1 << QString("abc");
+    QTest::newRow( "2" ) << ba1 << QStringLiteral("abc\0def");
 
     QTest::newRow( "3" ) << QByteArray::fromRawData("abcd", 3) << QString("abc");
     QTest::newRow( "4" ) << QByteArray("\xc3\xa9") << QString("\xc3\xa9");
@@ -849,12 +849,6 @@ void tst_QString::constructorQByteArray()
     QCOMPARE( strBA, expected );
 
     // test operator= too
-    if (src.constData()[src.length()] == '\0') {
-        str1.clear();
-        str1 = src.constData();
-        QCOMPARE( str1, expected );
-    }
-
     strBA.clear();
     strBA = src;
     QCOMPARE( strBA, expected );
@@ -2177,14 +2171,6 @@ void tst_QString::append_bytearray()
 
         QTEST( str, "res" );
     }
-
-    QFETCH( QByteArray, ba );
-    if (ba.constData()[ba.length()] == '\0') {
-        QFETCH( QString, str );
-
-        str.append(ba.constData());
-        QTEST( str, "res" );
-    }
 }
 
 void tst_QString::operator_pluseq_bytearray_data()
@@ -2210,14 +2196,6 @@ void tst_QString::operator_pluseq_bytearray()
 
         QTEST( str, "res" );
     }
-
-    QFETCH( QByteArray, ba );
-    if (ba.constData()[ba.length()] == '\0') {
-        QFETCH( QString, str );
-
-        str += ba.constData();
-        QTEST( str, "res" );
-    }
 }
 
 void tst_QString::operator_eqeq_bytearray_data()
@@ -2232,11 +2210,6 @@ void tst_QString::operator_eqeq_bytearray()
 
     QVERIFY(expected == src);
     QVERIFY(!(expected != src));
-
-    if (src.constData()[src.length()] == '\0') {
-        QVERIFY(expected == src.constData());
-        QVERIFY(!(expected != src.constData()));
-    }
 }
 
 void tst_QString::swap()
@@ -2271,7 +2244,7 @@ void tst_QString::prepend_bytearray_data()
     // byte array with only a 0
     ba.resize( 1 );
     ba[0] = 0;
-    QTest::newRow( "emptyString" ) << QString("foobar ") << ba << QString("foobar ");
+    QTest::newRow( "emptyString" ) << QString("foobar ") << ba << QStringLiteral("\0foobar ");
 
     // empty byte array
     ba.resize( 0 );
@@ -2301,14 +2274,6 @@ void tst_QString::prepend_bytearray()
 
         QTEST( str, "res" );
     }
-
-    QFETCH( QByteArray, ba );
-    if (ba.constData()[ba.length()] == '\0') {
-        QFETCH( QString, str );
-
-        str.prepend(ba.constData());
-        QTEST( str, "res" );
-    }
 }
 
 void tst_QString::replace_uint_uint()