Liang Qi 905329200f Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/gui/image/qpixmap.cpp src/widgets/kernel/qformlayout.cpp Change-Id: I8a8391a202adf7f18464a22ddf0a6c4974eab692		2016-10-11 07:40:32 +02:00
..
convertFromImage	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
convertFromToHICON	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
images	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
loadFromData	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
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	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-11 07:40:32 +02:00