Conflicts: src/corelib/text/qlocale.cpp src/network/access/qnetworkaccessmanager.cpp Regenerated tests/auto/testlib/selftests/float/CMakeLists.txt Change-Id: I5a8ae42511380ca49a38b13c6fa8a3c5df8bed01 |
||
|---|---|---|
| .. | ||
| json | ||
| qcborstreamreader | ||
| qcborstreamwriter | ||
| qcborvalue | ||
| qcborvalue_json | ||
| qdatastream | ||
| qdatastream_core_pixmap | ||
| qtextstream | ||
| qxmlstream | ||
| CMakeLists.txt | ||
| cborlargedatavalidation.cpp | ||
| serialization.pro | ||