58437fb125
Conflicts: src/corelib/serialization/qcborcommon.h src/corelib/tools/qlocale_data_p.h tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: Ibed987f6d77a0294f78f67d78625237616082416 |
||
---|---|---|
.. | ||
json | ||
qcborstreamreader | ||
qcborstreamwriter | ||
qcborvalue | ||
qcborvalue_json | ||
qdatastream | ||
qtextstream | ||
qxmlstream | ||
serialization.pro |