diff options
| author | Liang Qi <[email protected]> | 2016-10-10 09:28:12 +0200 |
|---|---|---|
| committer | Lars Knoll <[email protected]> | 2016-10-10 16:01:48 +0200 |
| commit | 102fa9b6db82ecd2b95d168912fde0c8bc3798b3 (patch) | |
| tree | 5bf934c323dcafb67cb508ace579110191ad782d /src/qml/jsruntime/qv4jsonobject.cpp | |
| parent | a6be2d77aa6dc9f834b971eaff749a02cf982525 (diff) | |
| parent | fff4477661ae240c43088fa6d9069ccf969dbee8 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/quick/quickwidgets/quickwidget/main.cpp
src/qml/jsruntime/qv4jsonobject.cpp
src/qml/jsruntime/qv4qobjectwrapper.cpp
src/qml/jsruntime/qv4qobjectwrapper_p.h
src/qml/qml/qqmlengine.cpp
src/qml/qml/qqmlpropertycache.cpp
src/qml/qml/qqmlpropertycache_p.h
src/quick/items/qquickanimatedsprite.cpp
src/quick/items/qquickitem.cpp
src/quick/items/qquickitem.h
src/quick/items/qquickitem_p.h
src/quick/items/qquickview_p.h
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgdefaultrendercontext.cpp
Change-Id: I172c6fbff97208f21ed4c8b6db3d1747a889f22b
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>()) { |