diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-16 15:27:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-18 13:14:52 +0200 |
| commit | 4241a5583623be758df3884c133acff2e11cd33f (patch) | |
| tree | cfc16898aca7238b3bf985e893db3fb7c7a85158 /src/qml/jsruntime/qv4value.cpp | |
| parent | 382709e14daeeb5132d6e39043b1140f251fc49b (diff) | |
Fix handling of empty Values
Make things consistent between 32 and 64 bit again
Adjust test results after the changes
Almost all uses of Value::empty() will get removed
in the future, but for now this gets all our tests
to pass again.
Change-Id: I44784a43432e78febbdfe78115c9be2a3e3ece76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4value.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4value.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4value.cpp b/src/qml/jsruntime/qv4value.cpp index ac47f48baf..f97aa66669 100644 --- a/src/qml/jsruntime/qv4value.cpp +++ b/src/qml/jsruntime/qv4value.cpp @@ -108,6 +108,7 @@ QString Value::toQStringNoThrow() const { switch (type()) { case Value::Undefined_Type: + case Value::Empty_Type: return QStringLiteral("undefined"); case Value::Null_Type: return QStringLiteral("null"); @@ -156,6 +157,7 @@ QString Value::toQString() const { switch (type()) { case Value::Undefined_Type: + case Value::Empty_Type: return QStringLiteral("undefined"); case Value::Null_Type: return QStringLiteral("null"); |