Liang Qi 4783de0473 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/network/socket/qnativesocketengine_winrt.cpp tools/configure/configureapp.cpp tools/configure/environment.cpp Change-Id: Ieae6f2ee004a87f041751852b687484f91ee4480		2016-11-24 10:31:21 +01:00
..
qmake-manual.qdoc	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-24 10:31:21 +01:00