Frederik Gladhorn ca2f44680c Merge branch 'stable' into dev ... Conflicts: examples/widgets/painting/shared/shared.pri src/corelib/tools/qharfbuzz_p.h src/corelib/tools/qunicodetools.cpp src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3		2013-01-04 11:12:05 +01:00
..
animation	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
codecs	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
global	QFlags: use unsigned int when the enum's underlying is unsigned	2012-09-28 23:50:10 +02:00
io	QUrl::fromUserInput: fix for urls without a host.	2012-12-23 10:50:28 +01:00
itemmodels	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
json	Added missing detach() to QJsonObject::take()	2012-12-13 23:58:51 +01:00
kernel	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
mimetypes	remove some unnecessary CONFIG additions	2012-12-17 14:08:17 +01:00
plugin	QPluginLoader: fix loading of plugins with a relative file name	2012-12-04 18:38:41 +01:00
statemachine	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
thread	Fix QMutex::tryLock with negative values	2012-12-23 20:34:46 +01:00
tools	Merge branch 'stable' into dev	2013-01-04 11:12:05 +01:00
xml	Fix regression in QXmlStreamWriter with codec set to UTF-16	2012-11-20 18:53:49 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00