Frederik Gladhorn 3f3be55835 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/gui/kernel/qplatformtheme.h tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp Change-Id: Iecd3343d6a050b8764f78d809c4a1532aeba69e5		2013-12-16 16:59:33 +01:00
..
clientserver	Fix warnings about overloaded virtuals in tests (CLANG).	2013-03-12 09:16:42 +01:00
test	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
udpServer	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
.gitignore	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
qudpsocket.pro	Moved network autotests into new directory structure	2011-09-09 09:32:17 +02:00
tst_qudpsocket.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-12-16 16:59:33 +01:00