summaryrefslogtreecommitdiff
path: root/src/corelib/serialization/qjsonparser.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-open...v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-10/+44
|\
| * JSON: When clearing duplicate object entries, also clear containersUlf Hermann2022-01-191-10/+44
* | Revert "Update commercial license headers to src/concurrent and src/corelib"Tarja Sundqvist2021-03-231-20/+20
|/
* Update commercial license headers to src/concurrent and src/corelibTarja Sundqvist2021-01-281-20/+20
* QJsonObject: fix sorting after parsing from JSON textThiago Macieira2020-09-301-29/+11
* Reimplement JSON support on top of CborUlf Hermann2019-10-211-270/+183
* Move away from using 0 as a pointer constantAllan Sandfeld Jensen2019-06-071-1/+3
* Prefix textstream operators with Qt::Lars Knoll2019-05-021-1/+1
* qjson: add missed Q_CHECK_PTRv5.12.0-beta3Ivan Komissarov2018-10-211-0/+1
* Create corelib/serialization and move existing file formats into itThiago Macieira2018-01-261-0/+1027