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
..
image	Deprecate qMemCopy/qMemSet in favour of their stdlib equivilents.	2012-04-11 10:46:19 +02:00
kernel	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00
math3d	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
painting	Fix MSVC warnings in tests.	2012-04-02 16:56:48 +02:00
qopengl	Fix MSVC warnings in tests.	2012-04-02 16:56:48 +02:00
text	Don't hardcode the default families in qfont_qpa.cpp	2012-04-10 12:49:34 +02:00
util	Restore Qt4 compat in QDesktopServices::DataLocation	2012-03-24 19:07:22 +01:00
gui.pro	Moved tests into gui/kernel/ and gui/qopengl/	2011-11-04 20:48:19 +01:00