summaryrefslogtreecommitdiffstats
path: root/src/corelib/json
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-211-1/+1
|\
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-191-1/+1
| |\
| | * Fix non-Latin1 strings in QJsonDocument on big-endian platformsThiago Macieira2016-01-151-1/+1
* | | Updated license headersJani Heikkinen2016-01-1514-196/+280
* | | Merge remote-tracking branch 'origin/5.6' into devFrederik Gladhorn2016-01-081-0/+12
|\ \ \ | |/ /
| * | Fix QJsonValue::fromVariant() if the variant contains a json objectLars Knoll2015-12-221-0/+12
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-182-0/+12
|\ \ \ | |/ /
| * | QJsonObject::(const_)iterator: add pointer typedefGiuseppe D'Angelo2015-12-112-0/+12
* | | Use "shortest" double conversion for JSONUlf Hermann2015-11-231-1/+2
|/ /
* | JSON: Fix MSVC2013 warningsOrgad Shaneh2015-11-132-4/+4
* | Libraries: Fix single-character string literals.Friedemann Kleint2015-10-133-8/+8
* | Doc: Move selected \keywords to be \targets insteadTopi Reinio2015-09-071-6/+6
* | qjsonarray: Remove a copy-ctor in Qt6Sérgio Martins2015-07-221-1/+3
* | QtCore: Use Q_NULLPTR instead of 0 in all public headersMarc Mutz2015-07-013-5/+5
* | core: Add several QList::reserve() calls.Sérgio Martins2015-06-112-1/+2
|/
* Make sure remove() doesn't corrupt the json objectLars Knoll2015-03-181-1/+1
* Add QJsonValueRef::toVariant()Lars Knoll2015-03-182-0/+6
* Fix quadratic behavior when parsing very large objectsLars Knoll2015-03-121-2/+4
* Doc: Json classes added to list of implic.shared classesNico Vertriest2015-03-115-0/+5
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-244-8/+30
|\
| * Doc: corrected link/autolink issues in corelibNico Vertriest2015-02-242-8/+23
| * Ensure that the binary JSON objects are actually sortedThiago Macieira2015-02-151-0/+5
| * Document and further test that QJsonObject::keys() is sorted.Mitch Curtis2015-02-111-0/+2
* | Optimize the Latin1 conversion code in the JSON parser with SSE2Thiago Macieira2015-02-151-5/+28
* | Update copyright headersJani Heikkinen2015-02-1114-98/+98
* | QtCore: Use QDebugStateSaver in (almost) all QDebug operator<<Kai Koehne2015-02-094-11/+15
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-271-0/+10
|\ \ | |/
| * QJsonArray::(const_)iterator: mark the pointer typedefs as internalGiuseppe D'Angelo2014-11-271-0/+10
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-242-1/+3
|\ \ | |/
| * Doc: corrected autolink issue jsonNico Vertriest2014-11-131-1/+1
| * QJsonArray::(const_)iterator: add the typedef for the pointer typeGiuseppe D'Angelo2014-11-131-0/+2
* | Add conversion between QVariantHash and QJsonObjectAllan Sandfeld Jensen2014-10-303-1/+49
|/
* Update license headers and add new license filesMatti Paaso2014-09-2414-266/+154
* Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-231-6/+6
|\
| * Doc: corrected autolink errors QjsonvalueNico Vertriest2014-08-251-6/+6
* | Revert "Reading QJsonObject property should not modify the object itself."Jędrzej Nowacki2014-09-114-83/+11
* | Don't accept json strings with trailing garbageLars Knoll2014-09-102-1/+14
* | Fix bugs in internal comparison operatorsLars Knoll2014-09-101-3/+20
* | Add operator-> to QJson iteratorsAllan Sandfeld Jensen2014-08-255-7/+67
* | Add initializer list support in QJsonObject.Jędrzej Nowacki2014-07-302-0/+42
* | Fix QJsonValue comparison.Jędrzej Nowacki2014-07-251-2/+4
* | Fix QJsonValue comparison.Jędrzej Nowacki2014-07-251-2/+4
* | Reading QJsonObject property should not modify the object itself.Jędrzej Nowacki2014-07-254-11/+83
* | Fix QJsonObject const index operatorJędrzej Nowacki2014-07-251-1/+1
* | Add initializer list support in QJsonArrayJędrzej Nowacki2014-07-042-0/+39
* | Update doc: match actual compact JSON outputmlpo2014-06-261-1/+1
* | json: Add defaultValue to QJsonValueRef toInt/toBool/toDouble/toStringHolger Hans Peter Freyther2014-06-131-0/+6
|/
* Complete QJsonValue::fromVariant()Sze Howe Koh2014-03-061-1/+3
* Doc: Clarify QJsonValue::fromVariant() type conversionsSze Howe Koh2014-03-041-12/+40
* Doc: Replace obsolete types with their newer counterpartsSze Howe Koh2014-02-252-15/+15