From 9367d966e6c10c95b92f2b55e2cead7e85d80cfe Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Wed, 23 Oct 2019 01:12:48 +0300
Subject: Fix a -Wclass-memaccess problem in qjson
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

qtbase/src/corelib/serialization/qjson_p.h:230:38: error: ‘void* memcpy(void*, const void*, size_t)’ copying an object of type ‘QJsonPrivate::qle_ushort’ {aka ‘class QSpecialInteger<QLittleEndianStorageType<short unsigned int> >’} with ‘private’ member ‘QSpecialInteger<QLittleEndianStorageType<short unsigned int> >::val’ from an array of ‘const class QChar’; use assignment or copy-initialization instead [-Werror=class-memaccess]
  230 |           str.length()*sizeof(ushort));
      |                                      ^

Change-Id: Ie58e7fe4bae3003227364012ad56ab23bd560d8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/corelib/serialization/qjson_p.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h
index 40b2414e4a..ff010cb902 100644
--- a/src/corelib/serialization/qjson_p.h
+++ b/src/corelib/serialization/qjson_p.h
@@ -222,7 +222,9 @@ public:
         for (int i = 0; i < str.length(); ++i)
             d->utf16[i] = uc[i];
 #else
-        memcpy(d->utf16, str.unicode(), str.length()*sizeof(ushort));
+        memcpy(static_cast<void *>(d->utf16),
+          static_cast<const void *>(str.unicode()),
+          str.length()*sizeof(ushort));
 #endif
         if (str.length() & 1)
             d->utf16[str.length()] = 0;
-- 
cgit v1.2.3