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
..
compilerwarnings/data	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
concurrent	Remove commented code from qtconcurrentmap autotest.	2012-03-14 07:51:45 +01:00
corelib	Merge master into api_changes	2012-03-27 19:22:48 +02:00
dbus	QtDBus: make some constructors explicit	2012-03-12 15:22:30 +01:00
gui	Merge master into api_changes	2012-03-27 19:22:48 +02:00
guiapplauncher
network	Merge master into api_changes	2012-03-23 14:10:58 +01:00
opengl	EGLFS: Integrate building into configure.	2012-03-21 03:03:29 +01:00
other	Merge master into api_changes	2012-03-27 19:22:48 +02:00
printsupport	QPrinterInfo: remove a test that is too early	2012-03-24 17:07:52 +01:00
shared	Refactor input context tests	2012-02-22 13:54:13 +01:00
sql	Fix compilation of tst_QSqlThread: no need to use QBasicAtomicInt here	2012-03-24 17:07:52 +01:00
testlib	testlib: Improve formatting of QCOMPARE failure messages.	2012-03-12 01:50:20 +01:00
tools	Bootstrap qdbuscpp2xml.	2012-03-18 14:14:42 +01:00
widgets	Merge master into api_changes	2012-03-27 19:22:48 +02:00
xml	clean up qmake-generated projects	2012-02-24 05:18:30 +01:00
auto.pro	Disable some tests and examples when --no-widgets is specified	2012-03-19 20:16:04 +01:00
network-settings.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
platformquirks.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
test.pl	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00