Frederik Gladhorn f4900d340a Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1		2013-02-18 16:14:52 +01:00
..
access	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
bearer	Check existence of QProcess feature before using it on Qt autotests.	2013-01-28 16:06:15 +01:00
kernel	tests: Fix some more old references and links to Nokia	2013-02-01 15:27:37 +01:00
socket	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
ssl	Merge remote-tracking branch 'origin/stable' into dev	2013-02-18 16:14:52 +01:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00