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
..
access	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-16 12:04:34 +02:00
bearer	Add unit test for usagePolicies	2012-04-11 22:20:03 +02:00
kernel	QHostAddress: improve qHash implementation	2012-04-08 18:25:10 +02:00
socket	Put bug numbers on same line as insignificant_test markers.	2012-04-16 03:10:22 +02:00
ssl	tst_qsslsocket*: don't inherit from QSharedPointer	2012-03-23 11:22:40 +01:00
network.pro	Mark unstable windows network tests	2012-03-08 05:31:40 +01:00