projects / platform / upstream / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3436b58) | patch
Fix the remaining test failures in the jsonbinding autotest
authorLars Knoll <lars.knoll@digia.com>
Mon, 17 Jun 2013 11:47:24 +0000 (13:47 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Mon, 17 Jun 2013 11:52:24 +0000 (13:52 +0200)
commitb7731f69f1e8c1410f860f74481222b4b3752505
tree09145305cc69a8add34b3be154dd0c8e4a76d7f1tree | snapshot
parent3436b58928b52c1cef643202969159324b8f0850commit | diff
Fix the remaining test failures in the jsonbinding autotest

Skip properties that are function objects when converting a V4 Object to a
QJsonObject. For arrays the function object gets replaced with null.
Fix the test case for arrays to have the correct expected output.

Change-Id: I3ee63935d038e0922e33ac6e64e9c31ecfbd4a7e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/v4/qv4jsonobject.cpp diff | blob | history
tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp diff | blob | history
Domain: UI Framework / Qt;