Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +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	Add qunsetenv(), next to qputenv() and friends.	2013-02-07 01:22:40 +01:00
io	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
itemmodels	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
json	Add toJson() formatting argument to QJsonDocument interface	2013-01-26 03:09:27 +01:00
kernel	Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev	2013-02-17 20:31:38 +01:00
mimetypes	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
plugin	Check existence of QProcess feature before using it on Qt autotests.	2013-01-28 16:06:15 +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-02-18 16:14:52 +01:00
xml	tests: Fix some more old references and links to Nokia	2013-02-01 15:27:37 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00