Fold the qv4jsonwrapper into the json object
authorLars Knoll <lars.knoll@digia.com>
Mon, 3 Jun 2013 19:28:07 +0000 (21:28 +0200)
committerSimon Hausmann <simon.hausmann@digia.com>
Mon, 3 Jun 2013 21:15:36 +0000 (23:15 +0200)
commitb4aa14e713bca625d3c43d3051983e605916351b
treec62df2553a12d1a5f7ec2f5a7d21811e1a1fc97e
parentb09555575936b8258a3385cce2c7401d0e672027
Fold the qv4jsonwrapper into the json object

Removes the need for an extra file, and cleans up the QV8Engine
a bit more.

Change-Id: I25e4c9252357a098041ecb188960777094c6b959
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/v4/qv4jsonobject.cpp
src/qml/qml/v4/qv4jsonobject_p.h
src/qml/qml/v4/qv4managed_p.h
src/qml/qml/v8/qv4jsonwrapper.cpp [deleted file]
src/qml/qml/v8/qv4jsonwrapper_p.h [deleted file]
src/qml/qml/v8/qv8engine.cpp
src/qml/qml/v8/qv8engine_p.h
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/qml/qml/v8/v8.pri