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
..
bootstrap	Disable QUrl support in QVariant in bootstrapped mode	2012-03-24 16:30:58 +01:00
moc	Ensure that moc doesn't resolve the qreal meta-type id	2012-03-18 21:05:59 +01:00
qdbuscpp2xml	Merge master into api_changes	2012-03-27 19:22:48 +02:00
qdbusxml2cpp	Bootstrap qdbusxml2cpp	2012-03-18 14:14:19 +01:00
qdoc	QDoc: updating manual to use "type".	2012-03-21 20:58:10 +01:00
rcc	Remove usage of QtXml from rcc, add test	2012-03-08 09:59:31 +01:00
uic	Remove QWorkspace.	2012-03-23 13:22:10 +01:00
tools.pro	Bootstrap qdbuscpp2xml.	2012-03-18 14:14:42 +01:00