Oswald Buddenhagen 143c4d3e13 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3		2012-04-10 15:31:45 +02:00
..
dialogs	QFileSystemModel: fix sorting	2012-04-07 19:45:39 +02:00
effects	Move tst_qicon.cpp and tst_qpixmapfilter.cpp to QtWidgets	2012-03-12 10:48:40 +01:00
graphicsview	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00
itemviews	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00
kernel	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00
styles	Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)	2012-03-22 16:13:21 +01:00
util	Implement QSystemTrayIcon for X11.	2012-03-23 11:45:25 +01:00
widgets	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00