Compile against latest qtbase

Adjust to the lastest changes in QList and QString.

Change-Id: I216b2746a3305222a21c5aead3aec6106ac1f035
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

2 files changed, 4 insertions, 4 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)
diff --git a/src/qml/jsruntime/qv4urlobject.cpp b/src/qml/jsruntime/qv4urlobject.cpp
index 6f9a9ecb69..937cd6e3a2 100644
--- a/src/qml/jsruntime/qv4urlobject.cpp
+++ b/src/qml/jsruntime/qv4urlobject.cpp
@@ -1270,7 +1270,7 @@ ReturnedValue UrlSearchParamsPrototype::method_set(const FunctionObject *b, cons
 
     bool matched = false;
 
-    for (auto *it = params.begin(); it != params.end();) {
+    for (auto it = params.begin(); it != params.end();) {
         QStringList &param = *it;
         if (param[0] == name) {
             if (!matched) {