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	Doc: Use title case in section1 titles	2014-09-30 13:52:51 +02:00
doc	update QtBearer NetworkManager backend API	2014-10-21 01:01:06 +02:00
kernel	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
socket	Windows native socket: handle WSAENETRESET the same as WSAECONNRESET	2014-10-22 08:11:20 +02:00
ssl	Merge remote-tracking branch 'origin/5.4' into dev	2014-10-27 13:00:36 +01:00
network.pro	Android: New bearer plugin	2014-07-10 23:09:31 +02:00