summaryrefslogtreecommitdiffstats
path: root/src/corelib/json
Commit message (Expand)AuthorAgeFilesLines
* doc: Fix some "Cannot tie this..." errorsMartin Smith2017-11-172-5/+3
* Replace Q_NULLPTR with nullptr where possibleKevin Funk2017-09-194-6/+6
* Move qle_bitfield to qendian_p.hAllan Sandfeld Jensen2017-06-271-89/+2
* Move endian integers to qendian_p.hAllan Sandfeld Jensen2017-06-212-46/+5
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-191-1/+1
|\
| * Fix reading qle_signedbitfield as intAllan Sandfeld Jensen2017-06-181-1/+1
* | json: Add operator[] to QJsonDocument for implicit object and array accessTor Arne Vestbø2017-06-082-0/+56
* | json: Add operator[] to QJsonValue for implicit object and array accessTor Arne Vestbø2017-06-082-0/+56
* | QJsonValue: implement copy-assignment via copy-and-swapGiuseppe D'Angelo2017-04-191-4/+1
* | QJson*: value semantics cleanupGiuseppe D'Angelo2017-04-198-0/+173
|/
* json encoder: Harmonize number serialization with ES6Marius Kittler2017-03-251-3/+6
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-252-4/+6
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-252-4/+6
| |\
| | * Fix two leaky uses of realloc()Edward Welbourne2016-11-232-4/+6
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-163-23/+43
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-153-23/+43
| |\ \ | | |/
| | * Revert "Optimize QJsonObject::operator=="Marc Mutz2016-11-142-4/+2
| | * Improve the validation algorithm for binary JSONLars Knoll2016-11-112-19/+41
* | | Improve error offset in JSON parsingAllan Sandfeld Jensen2016-11-151-1/+14
* | | Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8Liang Qi2016-11-082-7/+76
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-082-7/+76
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-042-7/+76
| | |\ \ | | | |/
| | | * Fix OOM crashes for huge json documentsLars Knoll2016-11-042-7/+76
* | | | QVariant to QJsonValue::Null conversionAllan Sandfeld Jensen2016-11-081-0/+8
|/ / /
* | | 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 5.8Liang Qi2016-08-292-21/+35
|\ \ \ | |/ /
| * | QtJson: simplify/add missing relational operators involving Latin1StringMarc Mutz2016-08-261-18/+32
| * | QtJson: mark String/Latin1String ctors explicitMarc Mutz2016-08-221-2/+2
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-181-1/+1
| |\ \ | | |/
| | * QJsonValue: use Q_NULLPTR instead of 0 in ctorDyami Caliri2016-08-171-1/+1
* | | Support C++17 fallthrough attributeAllan Sandfeld Jensen2016-08-191-2/+2
* | | QJsonValue::toVariant(): Differentiate between null and invalidChristian Kandeler2016-08-051-1/+2
* | | 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
* | | Add missing logical bitwise operators to the little-endian storage classesSimon Hausmann2016-07-131-0/+16
* | | Handle QVariantHash in QJsonDocument::fromVariantAllan Sandfeld Jensen2016-07-131-1/+3
* | | Make sure all private headers in Qt Core include qglobal_p.hThiago Macieira2016-06-252-0/+3
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-172-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-162-2/+2
| |\ \
| | * | Use void instead of uchar in the endian-swapping function parametersv5.7.0-rc1Thiago Macieira2016-05-262-2/+2
| | * | Merge remote-tracking branch 'origin/5.6.1' into 5.7.0Liang Qi2016-05-261-1/+1
| | |\ \
* | | \ \ Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-133-22/+10
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-102-2/+4
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Optimize QJsonObject::operator==Marc Mutz2016-06-082-2/+4
| * | | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-062-20/+6
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |