Gabriel de Dietrich 8ab25620d3 Merge remote-tracking branch 'origin/5.3' into 5.4 ... Conflicts: src/network/socket/qnativesocketengine_unix.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I6f1aa320d5ca66cd92d601a95885aeaab0abb191		2014-09-29 13:38:11 +02:00
..
access	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-09-29 13:38:11 +02:00
bearer	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
kernel	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
socket	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
ssl	tst_QSslError: cleanup unused functions	2014-09-26 00:39:37 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00