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
..
qmetaobjectbuilder.pro	don't erroneously claim that gui support is needed	2013-10-16 17:10:15 +02:00
tst_qmetaobjectbuilder.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-12-16 16:59:33 +01:00