Frederik Gladhorn 084c5b3db7 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754		2013-07-23 11:18:11 +02:00
..
animation	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
codecs	Ensure that the user codecs are listed in QTextCodec::availableCodecs	2013-07-21 07:30:48 +02:00
global	Make QFlags enum flags (C++11 strict enums) friendly	2013-05-09 12:17:59 +02:00
io	Merge remote-tracking branch 'origin/stable' into dev	2013-07-23 11:18:11 +02:00
itemmodels	Fix QAbstractItemModel::moveColumn()	2013-04-23 13:35:31 +02:00
json	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
kernel	Merge branch 'stable' into dev	2013-07-11 16:42:01 +02:00
mimetypes	QMimeDatabase: pass MatchMode down, to fix MatchContent.	2013-03-01 13:05:11 +01:00
plugin	Make the Mach-O size checking a little more robust	2013-07-20 02:09:41 +02:00
statemachine	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
thread	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-07-23 11:18:11 +02:00
xml	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00