Liang Qi 3e71810cf3 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/network/access/qhttpnetworkconnection.cpp src/network/access/qhttpnetworkconnection_p.h Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4		2016-10-08 17:15:55 +02:00
..
localfortuneserver.pro	Move Qt Core examples under a common subdirectory	2014-10-17 14:57:13 +02:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
server.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
server.h	Unify license header usage.	2016-03-29 10:20:03 +00:00