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	Update the floppy disk icon (save) to be physically correct	2018-11-06 20:43:36 +00:00
main.cpp	Replace Q_NULLPTR with nullptr where possible	2017-09-19 11:53:55 +00:00
mainwindow.cpp	Fix usage of QGuiApplication::set/resetOverrideCursor	2018-11-05 21:57:43 +00:00
mainwindow.h	Examples: Replace 'Q_DECL_OVERRIDE' by 'override'	2016-06-15 09:32:30 +00:00
sdi.pro	qtlite: Skip building examples when configured with no-feature-itemviews	2018-01-12 07:58:20 +00:00
sdi.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00