Frederik Gladhorn 80604a0786 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/plugins/platforms/cocoa/qnsview.mm Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa		2013-06-04 19:34:36 +02:00
..
animation	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
codecs	Fix regression when pasting into QTextEdit from Firefox.	2013-05-23 16:55:30 +02:00
global	Make QFlags enum flags (C++11 strict enums) friendly	2013-05-09 12:17:59 +02:00
io	Revert QDateTime serialisation to pre-Qt 5 behaviour.	2013-05-08 10:00:29 +02:00
itemmodels	Fix QAbstractItemModel::moveColumn()	2013-04-23 13:35:31 +02:00
json	Merge remote-tracking branch 'origin/stable' into dev	2013-06-04 19:34:36 +02:00
kernel	Make QTime::toString output milliseconds for Qt::TextDate, Qt::ISODate.	2013-06-03 17:05:12 +02:00
mimetypes	QMimeDatabase: pass MatchMode down, to fix MatchContent.	2013-03-01 13:05:11 +01:00
plugin	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01: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	Make QTime::toString output milliseconds for Qt::TextDate, Qt::ISODate.	2013-06-03 17:05:12 +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