summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsonobject.h
Commit message (Expand)AuthorAgeFilesLines
* QJsonObject: add some overloads taking QLatin1StringMarc Mutz2016-05-101-0/+7
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-181-2/+4
|\
| * Avoid size overflows when inserting into very large JSON objectsLars Knoll2016-02-181-2/+4
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-021-2/+2
|\|
| * QJsonObject has random-access iteratorsMarc Mutz2016-01-281-2/+2
* | Updated license headersJani Heikkinen2016-01-151-14/+20
|/
* QJsonObject::(const_)iterator: add pointer typedefGiuseppe D'Angelo2015-12-111-0/+2
* QtCore: Use Q_NULLPTR instead of 0 in all public headersMarc Mutz2015-07-011-2/+2
* Update copyright headersJani Heikkinen2015-02-111-7/+7
* Add conversion between QVariantHash and QJsonObjectAllan Sandfeld Jensen2014-10-301-0/+4
* Update license headers and add new license filesMatti Paaso2014-09-241-19/+11
* Add operator-> to QJson iteratorsAllan Sandfeld Jensen2014-08-251-3/+10
* Add initializer list support in QJsonObject.Jędrzej Nowacki2014-07-301-0/+15
* Add JSON parsing support to qmake.Morten Johan Sørvig2013-10-171-1/+1
* Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-291-4/+0
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-221-24/+24
* Add JSON support to the bootstrap libraryLars Knoll2012-02-151-0/+1
* Trivial fix in qjsonobject.h for -Werror=shadowJani Uusi-Rantala2012-02-021-2/+2
* Update contact address in license headers.Jason McDonald2012-01-311-1/+1
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
* Fixed includes in public headersDenis Dzyubenko2012-01-271-1/+1
* Import json support from playground/qtbinaryjsonLars Knoll2012-01-241-0/+218