diff options
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index ad718e32cb..49afc77705 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -2401,8 +2401,10 @@ bool ExecutionEngine::metaTypeFromJS(const Value &value, QMetaType metaType, voi *reinterpret_cast<double*>(data) = value.toNumber(); return true; case QMetaType::QString: - if (value.isUndefined() || value.isNull()) - *reinterpret_cast<QString*>(data) = QString(); + if (value.isUndefined()) + *reinterpret_cast<QString*>(data) = QStringLiteral("undefined"); + else if (value.isNull()) + *reinterpret_cast<QString*>(data) = QStringLiteral("null"); else *reinterpret_cast<QString*>(data) = value.toQString(); return true; |