summaryrefslogtreecommitdiffstats
path: root/src/corelib/json/qjsonobject.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-181-19/+75
|\
| * Fix quadratic behavior when converting from QVariantLars Knoll2016-02-181-4/+47
| * Avoid size overflows when inserting into very large JSON objectsLars Knoll2016-02-181-7/+22
| * Enable NRVO in QJsonObject::keys()Marc Mutz2016-02-121-8/+6
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-021-4/+10
|\ \ | |/
| * QJsonObject has random-access iteratorsMarc Mutz2016-01-281-4/+10
* | Updated license headersJani Heikkinen2016-01-151-14/+20
|/
* QJsonObject::(const_)iterator: add pointer typedefGiuseppe D'Angelo2015-12-111-0/+10
* core: Add several QList::reserve() calls.Sérgio Martins2015-06-111-1/+1
* Doc: Json classes added to list of implic.shared classesNico Vertriest2015-03-111-0/+1
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-241-0/+2
|\
| * Document and further test that QJsonObject::keys() is sorted.Mitch Curtis2015-02-111-0/+2
* | Update copyright headersJani Heikkinen2015-02-111-7/+7
* | QtCore: Use QDebugStateSaver in (almost) all QDebug operator<<Kai Koehne2015-02-091-1/+2
* | Add conversion between QVariantHash and QJsonObjectAllan Sandfeld Jensen2014-10-301-1/+42
|/
* Update license headers and add new license filesMatti Paaso2014-09-241-19/+11
* Revert "Reading QJsonObject property should not modify the object itself."Jędrzej Nowacki2014-09-111-7/+7
* Add operator-> to QJson iteratorsAllan Sandfeld Jensen2014-08-251-0/+10
* Add initializer list support in QJsonObject.Jędrzej Nowacki2014-07-301-0/+27
* Reading QJsonObject property should not modify the object itself.Jędrzej Nowacki2014-07-251-7/+7
* Fix QJsonObject const index operatorJędrzej Nowacki2014-07-251-1/+1
* Doc: Add QJsonObject::const_iterator() to correct groupTopi Reinio2013-12-051-0/+2
* Add JSON parsing support to qmake.Morten Johan Sørvig2013-10-171-1/+1
* Add json/savegame example.Mitch Curtis2013-08-221-2/+4
* Tidy up QJsonObject documentation.Mitch Curtis2013-08-201-19/+19
* Fix crashes when creating large documentsLars Knoll2013-05-091-5/+11
* Update copyright year in Digia's license headersSergio Ahumada2013-01-181-1/+1
* Added missing detach() to QJsonObject::take()Denis Dzyubenko2012-12-131-2/+3
* QtBase: Doc: Fix links to STL-style iteratorsDavid Schulz2012-12-061-4/+4
* Remove duplicate words and punctuation from documentation.Mitch Curtis2012-09-261-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/+3
* Fix some qdoc errors in the QJson* classesLars Knoll2012-08-201-0/+8
* Fixed most qdoc errors for the json classes.Lars Knoll2012-07-201-11/+34
* Fixed QJsonObject::find()Denis Dzyubenko2012-06-061-0/+1
* Doc: Prepare for building modular QtCore docs.Casper van Donderen2012-04-191-25/+19
* Fix warnings about signed/unsigned comparisons in QtJson.Friedemann Kleint2012-04-031-3/+3
* 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