Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978		2016-06-21 08:39:41 +02:00
..
images	Add test for invalid exif data	2015-07-17 11:37:02 +00:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qimage.pro	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qimage.qrc	Android: Fix qimage test.	2015-01-08 10:09:39 +01:00
tst_qimage.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02:00