aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlxmlhttprequest.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/qml/qqmlxmlhttprequest.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/qml/qqmlxmlhttprequest.cpp')
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlxmlhttprequest.cpp b/src/qml/qml/qqmlxmlhttprequest.cpp
index 9b06bd77ca..aeb57a7768 100644
--- a/src/qml/qml/qqmlxmlhttprequest.cpp
+++ b/src/qml/qml/qqmlxmlhttprequest.cpp
@@ -702,7 +702,7 @@ ReturnedValue CharacterData::method_length(const FunctionObject *b, const Value
if (!r)
RETURN_UNDEFINED();
- return Encode(r->d()->d->data.length());
+ return Encode(int(r->d()->d->data.length()));
}
ReturnedValue CharacterData::prototype(ExecutionEngine *v4)