Liang Qi 3e71810cf3 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/network/access/qhttpnetworkconnection.cpp src/network/access/qhttpnetworkconnection_p.h Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4		2016-10-08 17:15:55 +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	fix usage of wince scope	2015-06-05 10:29:10 +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.6' into 5.7	2016-10-08 17:15:55 +02:00