Liang Qi 6b8f422c5e Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/io/qsettings.cpp src/corelib/itemmodels/qstringlistmodel.cpp tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp Change-Id: I1c6c306ef42c3c0234b19907914b19da706b4a03		2016-08-13 01:05:02 +02:00
..
images	Doc: Move threading overviews from qtbase.git to qtdoc.git	2013-11-08 16:45:26 +01:00
snippets	Fix typo in doc snippets of qOverload and related	2016-07-19 10:49:06 +00:00
src	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
qtcore.qdocconf	Doc: Remove repository name from examplesinstallpath	2016-05-12 12:15:52 +00:00