Frederik Gladhorn 2eb26c1709 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d		2014-10-27 13:00:36 +01:00
..
access	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-27 13:00:36 +01:00
bearer	update QtBearer NetworkManager backend API	2014-10-21 01:01:06 +02:00
kernel	Disable tst_qhostinfo on OS X.	2014-10-10 13:15:43 +02:00
socket	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
ssl	Update QSsl::SecureProtocols to not include Sslv3	2014-10-24 12:46:26 +02:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00