Kent Hansen d236fe2214 Merge master into api_changes ... Conflicts: src/corelib/global/qisenum.h src/dbus/qdbusconnection_p.h src/widgets/kernel/qwidget.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d		2012-03-27 19:22:48 +02:00
..
image	Make tst_qmovie work in shadow builds	2012-03-22 18:59:45 +01:00
kernel	Merge master into api_changes	2012-03-27 19:22:48 +02:00
math3d	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
painting	Fix font cache check in QFontEngineFT::recalcAdvances()	2012-03-16 11:02:03 +01:00
qopengl	Make "nmake check" pass for gui tests in Windows.	2012-02-10 15:40:22 +01:00
text	Remove hardcoded font names in QFont::defaultFamily()	2012-03-21 09:00:22 +01:00
util	Restore Qt4 compat in QDesktopServices::DataLocation	2012-03-24 19:07:22 +01:00
gui.pro	Moved tests into gui/kernel/ and gui/qopengl/	2011-11-04 20:48:19 +01:00