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
..
qmake.conf	Add QMAKE_LFLAGS_SONAME to linker flags for Android plugins	2016-10-06 13:33:08 +00:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00