Use QString::DataPointer instead of QStringPrivate

Preparations to move QString over to use QArrayDataPointer instead
of it's own private struct.

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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/corelib/serialization/qbinaryjsonvalue.cpp b/src/corelib/serialization/qbinaryjsonvalue.cpp
index 92a8fd7ec5..b24bd0fc89 100644
--- a/src/corelib/serialization/qbinaryjsonvalue.cpp
+++ b/src/corelib/serialization/qbinaryjsonvalue.cpp
@@ -82,7 +82,7 @@ QBinaryJsonValue::QBinaryJsonValue(QBinaryJsonPrivate::MutableData *data,
 QBinaryJsonValue::QBinaryJsonValue(QString string)
     : d(nullptr), t(QJsonValue::String)
 {
-    stringData = *(QStringPrivate *)(&string);
+    stringData = string.data_ptr();
     stringData.d->ref();
 }
 
diff --git a/src/corelib/serialization/qbinaryjsonvalue_p.h b/src/corelib/serialization/qbinaryjsonvalue_p.h
index f2ca1a8094..4b39b05316 100644
--- a/src/corelib/serialization/qbinaryjsonvalue_p.h
+++ b/src/corelib/serialization/qbinaryjsonvalue_p.h
@@ -121,7 +121,7 @@ private:
         quint64 ui;
         bool b;
         double dbl;
-        QStringPrivate stringData;
+        QString::DataPointer stringData;
         const QBinaryJsonPrivate::Base *base;
     };
     QBinaryJsonPrivate::MutableData *d = nullptr; // needed for Objects and Arrays