Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I182d51367aed4518f5bbc247e4e517af09028f7a

1 files changed, 4 insertions, 1 deletions

diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp
index c9285b7..a77072b 100644
--- a/src/webchannel/qmetaobjectpublisher.cpp
+++ b/src/webchannel/qmetaobjectpublisher.cpp
@@ -619,7 +619,10 @@ QJsonValue QMetaObjectPublisher::wrapResult(const QVariant &result, QWebChannelA
 #endif
     } else if (result.canConvert<QVariantList>()) {
         // recurse and potentially wrap contents of the array
-        return wrapList(result.toList(), transport);
+        // *don't* use result.toList() as that *only* works for QVariantList and QStringList!
+        // Also, don't use QSequentialIterable (yet), since that seems to trigger QTBUG-42016
+        // in certain cases.
+        return wrapList(result.value<QVariantList>(), transport);
     }
 
     return QJsonValue::fromVariant(result);