Frederik Gladhorn aaff94c2df Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/tools/qbytearray.cpp src/gui/kernel/qplatformsystemtrayicon.cpp src/gui/kernel/qplatformsystemtrayicon.h src/plugins/platforms/xcb/xcb-plugin.pro Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79		2014-12-29 16:37:38 +01:00
..
animation	Android: Stabilize QPauseAnimation test	2014-12-22 09:26:38 +01:00
codecs	Hardcode UTF-8 for "unicode" in QTextCodec::codecForHtml().	2014-10-28 12:17:13 +01:00
global	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-29 16:37:38 +01:00
io	Android: Fix QTemporaryDir/File::nonWritableCurrentDir() tests	2014-12-22 09:28:05 +01:00
itemmodels	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00
json	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-29 16:37:38 +01:00
kernel	Fix QMetaProperty::write so it tries to register a property type.	2014-12-07 12:38:40 +01:00
mimetypes	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
plugin	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
statemachine	QState: Added template PointerToMemberFunction	2014-12-20 06:36:26 +01:00
thread	QThreadPool::cancel() to remove individual jobs from the job queue.	2014-12-24 15:01:36 +01:00
tools	QChar: prepare relational operators for constexpr'ification	2014-12-10 01:26:51 +01:00
xml	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00