Lars Knoll d5098f2802 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7		2012-03-12 21:03:49 +01:00
..
animation	Fix deadlock in QPropertyAnimation	2012-03-07 12:48:49 +01:00
codecs	Eliminate duplicate data row names in utf8 autotest.	2012-02-14 02:48:35 +01:00
global	Add Q_IS_ENUM(), and provide as flag in QMetaType::typeFlags()	2012-03-11 23:58:39 +01:00
io	Merge remote-tracking branch 'origin/master' into api_changes	2012-03-08 01:27:39 +01:00
itemmodels	Eliminate duplicate data row names from corelib autotests.	2012-02-14 06:19:16 +01:00
json	Fix a bug in the assignment operators for QJsonObject and Array	2012-03-08 16:06:48 +01:00
kernel	Merge remote-tracking branch 'origin/master' into api_changes	2012-03-12 21:03:49 +01:00
mimetypes	QMimeDatabase: Fix crash on empty filename	2012-03-06 12:10:42 +01:00
plugin	Fix QLibrary autotest for Windows	2012-02-28 12:45:28 +01:00
statemachine	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
thread	Fix indentation of QWaitCondition autotest.	2012-03-12 13:14:05 +01:00
tools	Merge remote-tracking branch 'origin/master' into api_changes	2012-03-12 21:03:49 +01:00
xml	Eliminate duplicate data row names from corelib autotests.	2012-02-14 06:19:16 +01:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00