diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-29 14:18:31 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2016-08-30 13:48:22 +0000 |
| commit | e3b277d5ccac5b9a5cdcbb292fb04d84d44c7869 (patch) | |
| tree | fec7c8ec16399685ea5015edacb19f9552668f0d /tests | |
| parent | 12d8004874c3f69ddd5aa7622da309c46930336b (diff) | |
Fix conversion of QByteArray back to String in JavaScript
Commit 3b7e2a69f7eb8597c807de39b4de39721e9e2bd2 changed behavior so that
QByteArray is converted to the JS ArrayBuffer type, which is a better
fit than QVariant. However ArrayBuffer does not have a toString method
in the spec, and therefore any previous implicit toString conversion
such as when passing to JSON.parse() would fail. To restore
compatibility this patch adds a non-spec toString() that performs an
UTF-8 conversion, as it was done previously through QVariant's toString.
Task-number: QTBUG-55562
Change-Id: I096046954f7b29f7258deaa9ef5c8fa9292552ef
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 28b9adea38..d28bbc1ffa 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -431,6 +431,12 @@ void tst_QJSValue::toString() QVERIFY(!o.engine()); QCOMPARE(o.toString(), QStringLiteral("1,2,3")); } + + { + QByteArray hello = QByteArrayLiteral("Hello World"); + QJSValue jsValue = eng.toScriptValue(hello); + QCOMPARE(jsValue.toString(), QString::fromUtf8(hello)); + } } void tst_QJSValue::toNumber() |