qt5base-lts/tests/benchmarks/network
Liang Qi f285687584 Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	examples/corelib/ipc/ipc.pro
	src/plugins/platforms/xcb/qxcbbackingstore.cpp
	tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp

Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf
2016-04-05 14:22:45 +02:00
..
access Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00
kernel Updated license headers 2016-01-21 18:55:18 +00:00
socket Remove Windows CE from tests (others). 2016-03-31 06:14:04 +00:00
ssl Updated license headers 2016-01-21 18:55:18 +00:00
network.pro compile fix for compiling without ssl 2011-08-04 15:01:11 +02:00