aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4arraybuffer.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-07-07 12:24:25 +0200
committerLars Knoll <lars.knoll@qt.io>2020-07-09 20:59:58 +0200
commitaef0aac581fbbead07be939873e34045137b94ff (patch)
tree8c3ba5f67027a1c7fef1ce3e6bbfbc3379558af3 /src/qml/jsruntime/qv4arraybuffer.cpp
parent03d039fcf255392d52b0fd4b6c47cedf546aa82f (diff)
Compile against latest qtbase
Adjust to the lastest changes in QList and QString. Change-Id: I216b2746a3305222a21c5aead3aec6106ac1f035 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arraybuffer.cpp')
-rw-r--r--src/qml/jsruntime/qv4arraybuffer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4arraybuffer.cpp b/src/qml/jsruntime/qv4arraybuffer.cpp
index a2fac21b29..3b361bcaf5 100644
--- a/src/qml/jsruntime/qv4arraybuffer.cpp
+++ b/src/qml/jsruntime/qv4arraybuffer.cpp
@@ -135,7 +135,7 @@ void Heap::SharedArrayBuffer::init(size_t length)
internalClass->engine->throwRangeError(QStringLiteral("ArrayBuffer: out of memory"));
return;
}
- auto data = new (&d) QArrayDataPointer<char>{ pair.first, pair.second, uint(length) };
+ auto data = new (&d) QArrayDataPointer<char>{ pair.first, pair.second, qsizetype(length) };
// can't use appendInitialize() because we want to set the terminating '\0'
memset(data->data(), 0, length + 1);
@@ -187,7 +187,7 @@ ReturnedValue SharedArrayBufferPrototype::method_get_byteLength(const FunctionOb
if (!a || a->isDetachedBuffer() || !a->isSharedArrayBuffer())
return b->engine()->throwTypeError();
- return Encode(a->d()->data()->size);
+ return Encode(int(a->d()->data()->size));
}
ReturnedValue SharedArrayBufferPrototype::method_slice(const FunctionObject *b, const Value *thisObject, const Value *argv, int argc)
@@ -252,7 +252,7 @@ ReturnedValue ArrayBufferPrototype::method_get_byteLength(const FunctionObject *
if (!a || a->isDetachedBuffer() || a->isSharedArrayBuffer())
return f->engine()->throwTypeError();
- return Encode(a->d()->data()->size);
+ return Encode(int(a->d()->data()->size));
}
ReturnedValue ArrayBufferPrototype::method_slice(const FunctionObject *b, const Value *thisObject, const Value *argv, int argc)