Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01:00
..
baseline	…
images	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
.gitignore	…
qimagereader.pro	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +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