summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsonobject.cpp
Commit message (Expand)AuthorAgeFilesLines
* Fix a bug in the assignment operators for QJsonObject and ArrayLars Knoll2012-03-081-1/+1
* Merge remote-tracking branch 'origin/api_changes'Lars Knoll2012-03-041-0/+1
|\
| * Make qlocale.h not depend on qvariant.h.Stephen Kelly2012-02-291-0/+1
* | Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-021-2/+2
|/
* Update contact address in license headers.Jason McDonald2012-01-311-1/+1
* Add a null pointer check to QJsonObject::toVariantMapLars Knoll2012-01-301-3/+5
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
* Import json support from playground/qtbinaryjsonLars Knoll2012-01-241-0/+1014