Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787		2016-12-16 16:38:33 +01:00
..
images	Fix the JPEG EXIF reader to deal with some broken/corrupt files	2016-12-01 08:17:04 +00:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qimage.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +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.8' into dev	2016-12-16 16:38:33 +01:00