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	…
snippets	Fixed docs explaining the Frameworks usage	2017-01-06 12:42:24 +00:00
src	Doc: Add description for mode argument of qmake's $$system()	2018-11-02 12:40:59 +00:00
qmake.qdocconf	Generate documentation .tags files for all of the docs	2018-10-31 08:38:02 +00:00