From ab28ef132ed4dc8d5137a43feb3e152b792e191a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 23 Feb 2018 10:39:22 +0100 Subject: Reapply 1514b4e85336245ef130deca5839267dba7b2e32 on 5.11 This change amends 305dd1b61f657474d751cc3b24f58249ec21b61b, which lost 1514b4e8 and brought src/corelib/json/qjsonarray.cpp back, which got removed in c9c9adeef943d8265b2dae57ff48992c23b6725a. In a6b697ca13945a174cff9f3e9b1af1cf61c0bea5, it was moved to src/corelib/serialization/qjsonarray.cpp in 5.11. Change-Id: Ic6134a78d75a9c245934cf70a67a54c80a3e7c85 Reviewed-by: Friedemann Kleint --- src/corelib/serialization/qjsonarray.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib/serialization') diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index c5a5aaf39d..8ee9ce0de7 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -318,7 +318,8 @@ QJsonArray QJsonArray::fromVariantList(const QVariantList &list) array.a->tableOffset = currentOffset; if (!array.detach2(sizeof(QJsonPrivate::offset)*values.size())) return QJsonArray(); - memcpy(array.a->table(), values.constData(), values.size()*sizeof(uint)); + memcpy(static_cast(array.a->table()), + static_cast(values.constData()), values.size()*sizeof(uint)); array.a->length = values.size(); array.a->size = currentOffset + sizeof(QJsonPrivate::offset)*values.size(); -- cgit v1.2.3