summaryrefslogtreecommitdiffstats
path: root/qjson.h
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'afbaa7b4382faced3c364606a5e5d5389462147b' into upstream-mergeMarcelo Tosatti2010-10-181-4/+3
|\
| * Use GCC_FMT_ATTR (format checking)Stefan Weil2010-10-031-2/+2
| * Replace most gcc format attributes by macro GCC_FMT_ATTR (format checking)Stefan Weil2010-10-031-2/+1
* | Add support for JSON pretty printingDaniel P. Berrange2010-10-011-0/+1
|/
* QJSON: Introduce qobject_from_jsonv()Luiz Capitulino2009-12-031-0/+2
* Provide marshalling mechanism for jsonAnthony Liguori2009-11-171-0/+3
* Add a QObject JSON wrapperAnthony Liguori2009-11-171-0/+23