Liang Qi 58437fb125 Merge remote-tracking branch 'origin/5.12' into dev ... 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		2018-11-10 11:38:40 +01:00
..
json	Implement QJsonValue data stream operator	2018-10-03 14:49:17 +00:00
qcborstreamreader	QCborStreamReader: make sure setDevice() clears the last error	2018-11-08 15:19:45 +00:00
qcborstreamwriter	Long live QCborStreamWriter!	2018-05-27 22:41:41 +00:00
qcborvalue	Fully support operator[] on QCborValue and QCborValueRef	2018-11-01 15:02:46 +00:00
qcborvalue_json	QCborValue: move the toDiagnosticNotation() function to its own file	2018-07-30 16:21:12 +00:00
qdatastream	Merge remote-tracking branch 'origin/5.12' into dev	2018-10-25 07:21:53 +02:00
qtextstream	QTextStream - re-enable manipulators test case	2018-09-17 06:09:29 +00:00
qxmlstream	Fix QXmlStreamWriter xmlns attribute placement	2018-09-28 13:19:48 +00:00
serialization.pro	QCborValue: add support for QVariant and JSON conversions	2018-06-08 07:46:41 +00:00