From 88c72d972a2b33acf6382107d4aa5ddb4af0d6ec Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Sat, 16 Nov 2019 16:29:29 +0100
Subject: [PATCH] Don't access QArrayData::sharedNull() from QByteArray anymore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I1292f8d2d62fa96ae4c6aa91c7c95c1f3a18570f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/text/qbytearray.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp
index 32642b83e39..4d862054884 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;