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
..
images	Doc: Solve issue with gridlayout image file	2018-11-02 12:41:10 +00:00
snippets	Merge remote-tracking branch 'origin/5.12' into dev	2018-11-10 11:38:40 +01:00
src	Merge remote-tracking branch 'origin/5.12' into dev	2018-10-25 07:21:53 +02:00
qtwidgets.qdocconf	doc: Add qtlinguist to depends for QtWidgets	2018-02-03 17:25:38 +00:00