diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-10 14:49:25 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-10-10 14:49:25 +0000 |
| commit | 8fe6b4d3ef03955c23a1d8816d4c947efbde381b (patch) | |
| tree | bb077d2bfa9c2d922eb83cb386859162aa3a63c1 /src/qml/jsruntime/qv4jsonobject.cpp | |
| parent | bae22adafc3a6f5ff7f920e71c1542dc25cf1bab (diff) | |
| parent | 102fa9b6db82ecd2b95d168912fde0c8bc3798b3 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/qml/jsruntime/qv4jsonobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4jsonobject.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 9636fefc14..94a6e4daa1 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -44,6 +44,7 @@ #include <qv4objectiterator_p.h> #include <qv4scopedvalue_p.h> #include <qv4runtime_p.h> +#include <qv4variantobject_p.h> #include "qv4string_p.h" #include <qstack.h> @@ -734,6 +735,10 @@ QString Stringify::Str(const QString &key, const Value &v) return std::isfinite(d) ? scope.result.toQString() : QStringLiteral("null"); } + if (const QV4::VariantObject *v = scope.result.as<QV4::VariantObject>()) { + return v->d()->data().toString(); + } + o = scope.result.asReturnedValue(); if (o) { if (!o->as<FunctionObject>()) { |