Get rid of unused flags in QArrayData

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

1 files changed, 4 insertions, 5 deletions

diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
index 940865b98e..e566cc21a2 100644
--- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp
@@ -148,14 +148,13 @@ private slots:
     void stdString();
 };
 
-static const QArrayData staticDataFlags = { Q_BASIC_ATOMIC_INITIALIZER(-1), QArrayData::StaticDataFlags, 0 };
 static const QByteArray::DataPointer staticStandard = {
-    static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)),
+    nullptr,
     const_cast<char *>("data"),
     4
 };
 static const QByteArray::DataPointer staticNotNullTerminated = {
-    static_cast<QTypedArrayData<char> *>(const_cast<QArrayData *>(&staticDataFlags)),
+    nullptr,
     const_cast<char *>("dataBAD"),
     4
 };
@@ -168,8 +167,8 @@ QByteArray verifyZeroTermination(const QByteArray &ba)
 
     QByteArray::DataPointer baDataPtr = const_cast<QByteArray &>(ba).data_ptr();
 
-    // Skip if isStatic() or fromRawData(), as those offer no guarantees
-    if (baDataPtr->isStatic() || baDataPtr->flags() & QArrayData::RawDataType)
+    // Skip if isStatic() as those offer no guarantees
+    if (baDataPtr->isStatic())
         return ba;
 
     int baSize = ba.size();