qt5base-lts/tests/auto/network/socket/qlocalsocket
Liang Qi 6357813207 Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	configure
	src/3rdparty/double-conversion/include/double-conversion/utils.h
	src/corelib/global/qnamespace.qdoc
	src/corelib/tools/qsimd_p.h
	tests/auto/corelib/io/qfile/tst_qfile.cpp

Change-Id: I3ca1007bab5355d251c13002a18e93d81c254d34
2016-05-03 15:49:15 +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-05-03 15:49:15 +02:00