diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
| commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
| tree | 8336143e8c09810dc97324970fed61af27e26a97 /doc/src/corelib/json.qdoc | |
| parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
| parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) | |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'doc/src/corelib/json.qdoc')
| -rw-r--r-- | doc/src/corelib/json.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/corelib/json.qdoc b/doc/src/corelib/json.qdoc index 91a89761e3d..88b53770742 100644 --- a/doc/src/corelib/json.qdoc +++ b/doc/src/corelib/json.qdoc @@ -59,12 +59,12 @@ JSON is a format to store structured data. It has 6 basic data types: \list - \o bool - \o double - \o string - \o array - \o object - \o null + \li bool + \li double + \li string + \li array + \li object + \li null \endlist Any value can be any of the above type. A boolean value is represented by the |