diff options
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index c8e0828f18..6ace973124 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -168,7 +168,10 @@ ReturnedValue throwTypeError(const FunctionObject *b, const QV4::Value *, const template <typename ReturnType> ReturnType convertJSValueToVariantType(const QJSValue &value) { - return value.toVariant().value<ReturnType>(); + const QVariant variant = value.toVariant(); + return variant.metaType() == QMetaType::fromType<QJSValue>() + ? ReturnType() + : variant.value<ReturnType>(); } struct JSArrayIterator { |