Liang Qi c0359bd3c3 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: src/corelib/global/qfloat16.cpp src/corelib/global/qfloat16.h src/plugins/platforms/windows/qwindowswindow.cpp Change-Id: I0938aaa6a9771f55e48c95ed29f6f5291431b947		2019-05-15 07:11:41 +02:00
..
json	Merge remote-tracking branch 'origin/5.13' into dev	2019-05-15 07:11:41 +02:00
qcborstreamreader	…
qcborstreamwriter	…
qcborvalue	…
qcborvalue_json	…
qdatastream	…
qdatastream_core_pixmap	…
qtextstream	…
qxmlstream	…
serialization.pro	…