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
..
accessibilityinspector	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
aglfn	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
corelib/qurl-generateTLDs	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
glgen	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
harfbuzz	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
integrity	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
lexgen	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
local_database	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
plugintest	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
unicode	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
xkbdatagen	Update license headers and add new license files	2014-09-24 12:26:19 +02:00