summaryrefslogtreecommitdiffstats
path: root/src/corelib/json
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | 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.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
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-021-1/+1
| |\ \ | | |/
| | * Replace qUnaligned{Load,Store} with the existing q{To,From}Unalignedv5.6.1-1v5.6.1Thiago Macieira2016-05-251-1/+1
| * | QJsonValue: fix use-after-free in assignment operatorMarc Mutz2016-06-011-19/+5
| |/
* | QJsonObject: add some overloads taking QLatin1StringMarc Mutz2016-05-104-2/+135
* | QJsonValue: don't create a temporary QString on every toString() invocationMarc Mutz2016-05-092-1/+18
* | QJsonObject: use reserve() to reduce memory allocationsAnton Kudryavtsev2016-04-261-0/+1
* | QtCore: mark more types as primitive/movableMarc Mutz2016-04-251-0/+2
* | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Liang Qi2016-03-132-2/+9
|\ \
| * \ Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-112-2/+9
| |\ \ | | |/
| | * QJsonParser: fix UB (misaligned store) in Parser::parseNumber()Marc Mutz2016-03-101-1/+1
| | * QString, QJson, QHash: Fix UBs involving unaligned loadsMarc Mutz2016-03-091-1/+1
| | * QJsonPrivate::q_littleendian: mark as primitive/movable, depending on TMarc Mutz2016-03-011-0/+7
* | | QtCore: use printf-style qWarning/qDebug where possible (I)Marc Mutz2016-03-112-3/+3
|/ /
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-186-34/+154
|\ \ | |/
| * Fix quadratic behavior when converting from QVariantLars Knoll2016-02-182-6/+86
| * Avoid size overflows when inserting into very large JSON objectsLars Knoll2016-02-186-20/+62
| * Enable NRVO in QJsonObject::keys()Marc Mutz2016-02-121-8/+6
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-022-6/+12
|\ \ | |/
| * QJsonObject has random-access iteratorsMarc Mutz2016-01-282-6/+12
* | Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/devLiang Qi2016-01-261-1/+1
|\ \
| * \ 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
* | | | Add Intel copyright to files that Intel has had non-trivial contributionThiago Macieira2016-01-211-0/+1
* | | | Update the Intel copyright yearThiago Macieira2016-01-212-2/+2
|/ / /
* | | 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