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
..
src	Merge master into api_changes	2012-03-27 19:22:48 +02:00