qt5base-lts/tests/auto/network/socket/qlocalsocket
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
..
socketprocess Updated license headers 2016-01-21 18:55:18 +00:00
test QtNetwork: Remove Windows CE. 2016-03-29 20:28:18 +00:00
.gitignore tst_qlocalsocket: get rid of QtScript dependency 2012-10-19 02:43:05 +02:00
qlocalsocket.pro tst_qlocalsocket: get rid of QtScript dependency 2012-10-19 02:43:05 +02:00
tst_qlocalsocket.cpp Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00