Kent Hansen 440f452aa3 Merge master into api_changes ... Conflicts: src/corelib/kernel/qmetatype.cpp src/gui/kernel/qplatformsurface_qpa.cpp tests/auto/corelib/tools/qtimeline/qtimeline.pro Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178		2012-03-16 10:01:29 +01:00
..
animation	Fix deadlock in QPropertyAnimation	2012-03-07 12:48:49 +01:00
codecs	UTF8-Codec test: Fix compilation with g++/C++0X.	2012-03-15 14:51:50 +01:00
global	Add Q_IS_ENUM(), and provide as flag in QMetaType::typeFlags()	2012-03-11 23:58:39 +01:00
io	Merge master into api_changes	2012-03-16 10:01:29 +01:00
itemmodels	Eliminate duplicate data row names from corelib autotests.	2012-02-14 06:19:16 +01:00
json	Trailing comma should result in an error during JSON parsing	2012-03-12 21:38:51 +01:00
kernel	Merge master into api_changes	2012-03-16 10:01:29 +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 master into api_changes	2012-03-16 10:01:29 +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