Simon Hausmann 015002fec9 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61		2014-12-10 07:58:06 +01:00
..
animation	Update license headers and add new license files	2014-09-24 12:26:19 +02: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-10 07:58:06 +01:00
io	Disable the tests that verify that the available space shrunk	2014-11-22 20:02:45 +01:00
itemmodels	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-10 07:58:06 +01:00
json	Add conversion between QVariantHash and QJsonObject	2014-10-30 12:14:42 +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	tst_QState: fix memleaks	2014-10-19 13:18:12 +02:00
thread	Use the new warning enabling/disabling macros in qtbase	2014-12-03 18:09:17 +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