diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-07-25 16:14:49 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-07-25 20:31:21 +0000 |
| commit | 00e95e35061c169237402af4b017e70175a881db (patch) | |
| tree | 626396c964af7af1b408e13c110fa60238ee06b8 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 268d40b9f7c3686fa3e061ae966a51c5ac192543 (diff) | |
V4: Allow conversion from string to QByteArray when setting bindables
We allow it everywhere else, too.
Pick-to: 6.2 6.3 6.4
Fixes: QTBUG-105044
Change-Id: I714e5d501a780310791523c5f35a87681c69b1fb
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 3e899ccb38..200d5b0e3f 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -2294,6 +2294,8 @@ bool ExecutionEngine::metaTypeFromJS(const Value &value, QMetaType metaType, voi case QMetaType::QByteArray: if (const ArrayBuffer *ab = value.as<ArrayBuffer>()) *reinterpret_cast<QByteArray*>(data) = ab->asByteArray(); + else if (const String *string = value.as<String>()) + *reinterpret_cast<QByteArray*>(data) = string->toQString().toUtf8(); else *reinterpret_cast<QByteArray*>(data) = QByteArray(); return true; |