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
..
image	Move the auto test of QPixmap::grabWidget() from QPixmap to QWidget	2012-03-12 17:33:15 +01:00
kernel	Merge master into api_changes	2012-03-16 10:01:29 +01:00
math3d	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
painting	Move tst_qprinter.cpp to QtPrintSupport	2012-03-12 13:14:05 +01:00
qopengl	Make "nmake check" pass for gui tests in Windows.	2012-02-10 15:40:22 +01:00
text	Clean up some auto tests of gui	2012-03-12 13:14:05 +01:00
util	Clean up some auto tests of gui	2012-03-12 13:14:05 +01:00
gui.pro	Moved tests into gui/kernel/ and gui/qopengl/	2011-11-04 20:48:19 +01:00