Liang Qi a224dfc9d1 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: tests/auto/corelib/io/qprocess/tst_qprocess.cpp Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4		2016-02-29 12:34:31 +01:00
..
convertFromImage	…
convertFromToHICON	…
images	…
loadFromData	…
.gitignore	…
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-02-29 12:34:31 +01:00