Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5 ... Conflicts: mkspecs/android-g++/qmake.conf qmake/generators/unix/unixmake2.cpp src/gui/image/qimage_conversions.cpp Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0		2015-03-31 10:03:31 +02:00
..
animation	Update copyright headers	2015-02-11 06:49:51 +00:00
codecs	Fix support for iso8859-16 when compiling with ICU	2015-03-18 07:34:55 +00:00
global	Updated BSD licensed file headers	2015-02-15 07:41:17 +00:00
io	Update strtoll and strtoull from upstream FreeBSD	2015-03-26 06:11:14 +00:00
itemmodels	Update copyright headers	2015-02-11 06:49:51 +00:00
json	Make sure remove() doesn't corrupt the json object	2015-03-18 07:34:59 +00:00
kernel	Fix source incompatibility while connecting signals with forward declared arguments	2015-03-18 07:33:19 +00:00
mimetypes	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-03-31 10:03:31 +02:00
plugin	Fix building test qpluginloader/machtest against installed qtbase	2015-03-25 10:03:38 +00:00
statemachine	QStateMachine: add objectName to objects to ease debugging.	2015-03-16 12:55:00 +00:00
thread	Do not search test binary if QProcess is not supported.	2015-03-23 08:38:58 +00:00
tools	Update CLDR to v27	2015-03-27 16:40:16 +00:00
xml	Update copyright headers	2015-02-11 06:49:51 +00:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00