diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-01-18 10:12:50 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-24 15:28:20 +0100 |
commit | 37a7b035f8feb248d25741b22e22ffb0ec7463d6 (patch) | |
tree | 8f323ed9ef5554d8debae92ba0a95f05d6162d3b /tests/benchmarks/corelib/corelib.pro | |
parent | 4b8ceb41aed352f10d36db5284453f425dbc5f3f (diff) |
Import json support from playground/qtbinaryjson
This imports the JSON support for Qt 5 from
playground/qtbinaryjson.
It adds a fast, fully compliant json parser, a
convenient C++ API, conversion to and from
QVariants and a binary format for JSON that is
extremely fast to use together with the C++ API.
Change-Id: If9e3a21a4241d388d0abaa446b6824f9cc6edb1c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/benchmarks/corelib/corelib.pro')
-rw-r--r-- | tests/benchmarks/corelib/corelib.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro index a2efe91a61..da5247cc42 100644 --- a/tests/benchmarks/corelib/corelib.pro +++ b/tests/benchmarks/corelib/corelib.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS = \ io \ + json \ kernel \ thread \ tools \ @@ -14,4 +15,4 @@ TRUSTED_BENCHMARKS += \ thread/qthreadstorage \ io/qdir/tree -include(../trusted-benchmarks.pri)
\ No newline at end of file +include(../trusted-benchmarks.pri) |