Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +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-11-24 13:39:13 +01:00
io	Disable the tests that verify that the available space shrunk	2014-11-22 20:02:45 +01:00
itemmodels	QAbstractProxyModel: fix canDropMimeData/dropMimeData implementations	2014-11-24 08:05:43 +01:00
json	Add conversion between QVariantHash and QJsonObject	2014-10-30 12:14:42 +01:00
kernel	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +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	tst_QThreadPool: fix memleak	2014-10-19 13:18:07 +02:00
tools	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +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