Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
images	JPEG: Fix reading of EXIF orientation.	2015-01-06 14:26:00 +01:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qimage.pro	Android: Fix qimage test.	2015-01-08 10:09:39 +01:00
qimage.qrc	Android: Fix qimage test.	2015-01-08 10:09:39 +01:00
tst_qimage.cpp	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00