summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsondocument.cpp
Commit message (Expand)AuthorAgeFilesLines
* Create corelib/serialization and move existing file formats into itThiago Macieira2018-01-261-667/+0
* doc: Fix some "Cannot tie this..." errorsMartin Smith2017-11-171-2/+2
* json: Add operator[] to QJsonDocument for implicit object and array accessTor Arne Vestbø2017-06-081-0/+52
* QJson*: value semantics cleanupGiuseppe D'Angelo2017-04-191-0/+22
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-011-2/+1
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-221-2/+1
| |\
| | * QJsonDocument: fix repetition of 'document' in docAnton Kudryavtsev2016-10-191-2/+1
* | | QJsonDocument: enable NRVO for gcc in toJson()Anton Kudryavtsev2016-10-181-3/+2
* | | QJsonDocument: don't re-call QVariant::type() in if-else chainAnton Kudryavtsev2016-10-181-4/+11
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-191-7/+5
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-041-7/+5
| |\ \ | | |/
| | * Doc: Improve QJsonDocument::fromJson documentationKai Koehne2016-07-011-7/+5
* | | Handle QVariantHash in QJsonDocument::fromVariantAllan Sandfeld Jensen2016-07-131-1/+3
|/ /
* | QtCore: use printf-style qWarning/qDebug where possible (I)Marc Mutz2016-03-111-1/+1
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-181-2/+2
|\ \ | |/
| * Avoid size overflows when inserting into very large JSON objectsLars Knoll2016-02-181-2/+2
* | Updated license headersJani Heikkinen2016-01-151-14/+20
|/
* Libraries: Fix single-character string literals.Friedemann Kleint2015-10-131-1/+1
* Doc: Json classes added to list of implic.shared classesNico Vertriest2015-03-111-0/+1
* Update copyright headersJani Heikkinen2015-02-111-7/+7
* QtCore: Use QDebugStateSaver in (almost) all QDebug operator<<Kai Koehne2015-02-091-1/+2
* Update license headers and add new license filesMatti Paaso2014-09-241-19/+11
* Update doc: match actual compact JSON outputmlpo2014-06-261-1/+1
* Doc: Replace obsolete types with their newer counterpartsSze Howe Koh2014-02-251-2/+2
* Add JSON parsing support to qmake.Morten Johan Sørvig2013-10-171-1/+5
* Doc: Adding mark-up to boolean default values.Jerome Pasion2013-10-081-4/+4
* Add json/savegame example.Mitch Curtis2013-08-221-0/+2
* Add toJson() formatting argument to QJsonDocument interfaceJean-Paul Delimat2013-01-261-2/+37
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-221-24/+24
* Doc: Add \inmodule QtCore to all QtCore class doc bodiesThiago Macieira2012-08-231-0/+1
* Make the "\internal" qdoc command stand on its own lineLaszlo Papp2012-08-151-1/+2
* Fixed most qdoc errors for the json classes.Lars Knoll2012-07-201-13/+18
* Doc: Prepare for building modular QtCore docs.Casper van Donderen2012-04-191-8/+8
* Don't copy the whole binary input into QJsonDocumentDenis Dzyubenko2012-03-291-3/+4
* Validate size of the input in QJsonDocument::fromBinaryDataDenis Dzyubenko2012-03-291-2/+4
* Make qlocale.h not depend on qvariant.h.Stephen Kelly2012-02-291-0/+1
* Added error reporting to QJsonParserAndrew Christian2012-02-181-2/+2
* Fixed alignment check in QJsonDocument::fromRawDataDenis Dzyubenko2012-02-101-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
* Import json support from playground/qtbinaryjsonLars Knoll2012-01-241-0/+536