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
..
.gitattributes	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
.gitignore	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
qbytearray.pro	Add Objective-C specific type converters to QByteArray	2014-03-08 00:21:53 +01:00
rfc3252.txt	Moving relevant tests to corelib/tools	2011-09-01 13:07:23 +02:00
tst_qbytearray_mac.mm	Add Objective-C specific type converters to QByteArray	2014-03-08 00:21:53 +01:00
tst_qbytearray.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00