Merge remote-tracking branch 'origin/dev' into merge-dev

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 3 insertions, 1 deletions

diff --git a/src/corelib/serialization/qbinaryjsonvalue_p.h b/src/corelib/serialization/qbinaryjsonvalue_p.h
index 498fc62ecd..c3b943250c 100644
--- a/src/corelib/serialization/qbinaryjsonvalue_p.h
+++ b/src/corelib/serialization/qbinaryjsonvalue_p.h
@@ -86,6 +86,7 @@ public:
 
     QBinaryJsonValue(QBinaryJsonValue &&other) noexcept
         : ui(other.ui),
+          stringData(std::move(other.stringData)),
           d(other.d),
           t(other.t)
     {
@@ -96,6 +97,7 @@ public:
 
     QBinaryJsonValue &operator =(QBinaryJsonValue &&other) noexcept
     {
+        qSwap(stringData, other.stringData);
         qSwap(ui, other.ui);
         qSwap(d, other.d);
         qSwap(t, other.t);
@@ -122,9 +124,9 @@ private:
         quint64 ui;
         bool b;
         double dbl;
-        QStringData *stringData;
         const QBinaryJsonPrivate::Base *base;
     };
+    QString stringData;
     QBinaryJsonPrivate::MutableData *d = nullptr; // needed for Objects and Arrays
     QJsonValue::Type t = QJsonValue::Null;
 };