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
..
arch	Make architecture detection more robust.	2012-03-22 20:59:27 +01:00
mac	Clean up default arch setting on Mac OS X	2012-02-17 11:44:29 +01:00
qpa	EGLFS: Integrate building into configure.	2012-03-21 03:03:29 +01:00
unix	Merge master into api_changes	2012-03-27 19:22:48 +02:00
x11	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00