motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote branch 'qmp/for-anthony' into staging

Browse source
This commit is contained in:
Anthony Liguori 2010-10-05 13:54:49 -05:00
commit 48f57044e6
12 changed files with 1527 additions and 1192 deletions
Download patch file Download diff file Expand all files Collapse all files

1
qjson.h
View file

@ -23,5 +23,6 @@ QObject *qobject_from_jsonf(const char *string, ...) GCC_FMT_ATTR(1, 2);
QObject *qobject_from_jsonv(const char *string, va_list *ap) GCC_FMT_ATTR(1, 0);
QString *qobject_to_json(const QObject *obj);
QString *qobject_to_json_pretty(const QObject *obj);
#endif /* QJSON_H */