Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af		2015-01-21 11:10:14 +01:00
..
baseline	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
images	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
android_testdata.qrc	Android: Fix QImageReader test	2015-01-16 09:27:15 +01:00
qimagereader.pro	Android: Fix QImageReader test	2015-01-16 09:27:15 +01:00
qimagereader.qrc	Fixed crash in image reader when reading certain BMP files.	2013-02-06 09:59:56 +01:00
tst_qimagereader.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00