Frederik Gladhorn 5e8ae03578 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure qmake/generators/mac/pbuilder_pbx.cpp src/corelib/kernel/qtimerinfo_unix.cpp src/plugins/platforms/cocoa/qcocoabackingstore.mm src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/xcb/qglxintegration.cpp Change-Id: I8d125fe498f5304874e6976b53f588d3e98a66ac		2013-03-05 13:42:11 +01:00
..
animation	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
codecs	Correctly detect HTML 5 charset attribute in QTextCodec::codecForHtml()	2013-02-12 01:31:26 +01:00
global	Enable QGlobalStatic autotest.	2013-02-28 23:43:50 +01:00
io	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01:00
json	Add toJson() formatting argument to QJsonDocument interface	2013-01-26 03:09:27 +01:00
kernel	Add private API to connect to slots in QObjectPrivate	2013-02-28 19:22:05 +01:00
mimetypes	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
plugin	Make sure that the reference count for plugins is kept correctly	2013-02-27 07:09:18 +01:00
statemachine	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
thread	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
tools	Merge remote-tracking branch 'origin/stable' into dev	2013-03-05 13:42:11 +01: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