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
..
codecs	Fixed benchmarks to work from install directory	2012-03-19 01:18:20 +01:00
io	Port to the new QUrl API	2012-03-30 01:19:59 +02:00
json	Significantly speed up insertion into QJsonObject/Array	2012-03-22 18:59:45 +01:00
kernel	Merge master into api_changes	2012-03-19 10:03:48 +01:00
plugin	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
thread	Remove Symbian specific code from qtbase.	2012-01-31 07:08:31 +01:00
tools	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00
corelib.pro	Import json support from playground/qtbinaryjson	2012-01-24 15:28:20 +01:00