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
..
qicoimageformat	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qicon	Fix compilation without process support	2016-05-20 10:37:18 +00:00
qimage	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-01 10:03:21 +02:00
qimageiohandler	Updated license headers	2016-01-21 18:55:18 +00:00
qimagereader	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qimagewriter	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
qmovie	Updated license headers	2016-01-21 18:55:18 +00:00
qpicture	Updated license headers	2016-01-21 18:55:18 +00:00
qpixmap	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-04 08:59:18 +02:00
qpixmapcache	Updated license headers	2016-01-21 18:55:18 +00:00
image.pro	…