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
..
qeasingcurve.pro	Expect tst_QEasingCurve::setCustomType() failing on 32 bit Ubuntu 11.10	2013-07-20 11:21:51 +02:00
tst_qeasingcurve.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00