qt5base-lts/tests/auto/network/socket/qlocalsocket
Liang Qi 990969655c Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
	config_help.txt
	configure
	src/corelib/io/qprocess_wince.cpp
	src/plugins/platforms/windows/qwindowstheme.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp
	tests/auto/corelib/tools/qtimezone/BLACKLIST
	tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: I26644d1cb3b78412c8ff285e2a55bea1bd641c01
2016-05-12 08:33:08 +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-12 08:33:08 +02:00