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
..
src	Merge master into api_changes	2012-03-16 10:01:29 +01:00