Liang Qi f285687584 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: examples/corelib/ipc/ipc.pro src/plugins/platforms/xcb/qxcbbackingstore.cpp tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf		2016-04-05 14:22:45 +02:00
..
convertFromImage	…
convertFromToHICON	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
images	…
loadFromData	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
.gitignore	…
qpixmap.pro	QtGui: Remove Windows CE.	2016-03-30 17:35:41 +00:00
qpixmap.qrc	Android: Fix qpixmap test.	2015-01-08 10:10:50 +01:00
tst_qpixmap.cpp	QtGui: Remove Windows CE.	2016-03-30 17:35:41 +00:00