Lars Knoll 9bd0323551 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e		2012-04-16 12:04:34 +02:00
..
dialogs	Deprecate qMemCopy/qMemSet in favour of their stdlib equivilents.	2012-04-11 10:46:19 +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-16 12:04:34 +02:00
itemviews	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00
kernel	QLayoutItem - make controlTypes a virtual function.	2012-04-13 10:17:44 +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-16 12:04:34 +02:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00