Merge remote-tracking branch 'origin/dev' into wip/new-backend

Change-Id: Iff06429f948ac6cdec77a9e5bb8c5375c56fe705

1 files changed, 7 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 526522cb10..023ecbbb64 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -1843,8 +1843,13 @@ ReturnedValue QQmlXMLHttpRequestCtor::method_send(const BuiltinFunction *b, QV4:
         THROW_DOM(DOMEXCEPTION_INVALID_STATE_ERR, "Invalid state");
 
     QByteArray data;
-    if (callData->argc > 0)
-        data = callData->args[0].toQStringNoThrow().toUtf8();
+    if (callData->argc > 0) {
+        if (const ArrayBuffer *buffer = callData->args[0].as<ArrayBuffer>()) {
+            data = buffer->asByteArray();
+        } else {
+            data = callData->args[0].toQStringNoThrow().toUtf8();
+        }
+    }
 
     return r->send(w, scope.engine->callingQmlContext(), data);
 }