Don't access QArrayData::sharedNull() from QByteArray anymore

Change-Id: I1292f8d2d62fa96ae4c6aa91c7c95c1f3a18570f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 2 insertions, 4 deletions

diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index 32642b83e3..4d86205488 100644
--- a/src/corelib/text/qbytearray.cpp
+++ b/src/corelib/text/qbytearray.cpp
@@ -1209,13 +1209,11 @@ QByteArray &QByteArray::operator=(const QByteArray & other) noexcept
 QByteArray &QByteArray::operator=(const char *str)
 {
     if (!str || !*str) {
-        QPair<Data *, char *> pair;
         if (!str) {
-            pair = qMakePair(Data::sharedNull(), Data::sharedNullData());
+            d.clear();
         } else {
-            pair = Data::allocate(0);
+            d = QByteArrayData(Data::allocate(0), 0);
         }
-        d = QByteArrayData(pair.first, pair.second, 0);
     } else {
         const int len = int(strlen(str));
         const uint fullLen = uint(len) + 1;