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, 4 insertions, 4 deletions

diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 8f0d306cba..f6bd09958e 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -1378,8 +1378,8 @@ void tst_QTextDocumentFragment::html_listStart1()
 {
     // don't create a block for the <ul> element, even if there's some whitespace between
     // it and the <li>
-    const char html[] = "<ul>        <li>list item</li><ul>";
-    cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(html, sizeof(html) / sizeof(html[0]))));
+    const QString html = QStringLiteral("<ul>        <li>list item</li><ul>");
+    cursor.insertFragment(QTextDocumentFragment::fromHtml(html));
 
     QCOMPARE(doc->blockCount(), 1);
 }
@@ -1387,8 +1387,8 @@ void tst_QTextDocumentFragment::html_listStart1()
 void tst_QTextDocumentFragment::html_listStart2()
 {
     // unlike with html_listStart1 we want a block showing the 'buggy' text here
-    const char html[] = "<ul>buggy, but text should appear<li>list item</li><ul>";
-    cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(html, sizeof(html) / sizeof(html[0]))));
+    const QString html = QStringLiteral("<ul>buggy, but text should appear<li>list item</li><ul>");
+    cursor.insertFragment(QTextDocumentFragment::fromHtml(html));
 
     QCOMPARE(doc->blockCount(), 2);
 }