Oswald Buddenhagen 189dc655bb Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/image/qimage.cpp src/gui/image/qppmhandler.cpp src/gui/kernel/qguiapplication.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765		2014-09-29 14:08:49 +02:00
..
.gitignore	Moving relevant tests to corelib/global	2011-08-30 13:17:21 +02:00
qgetputenv.pro	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
tst_qgetputenv.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00