2 Commits

Author	SHA1	Message	Date
Sergio Ahumada	d1950d8e52	tests: do not run benchmarks by default in 'make check' ... `make check' is intended primarily for running functional tests. For the most part, it does not make sense to run benchmarks in the same test environment as the functional tests. Change-Id: I79f867fdab295bdbd4c4b3c785dfd7ede520022e Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>	2012-02-02 09:27:25 +01:00
Lars Knoll	37a7b035f8	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>	2012-01-24 15:28:20 +01:00