qt6-bb10/tests/auto/network/socket/qlocalsocket
Liang Qi f8246099ea Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
	src/corelib/io/qstorageinfo_unix.cpp
	src/plugins/platforms/windows/qwindowsmousehandler.cpp
	src/widgets/styles/qwindowsvistastyle.cpp

Change-Id: Ie1725933815891cc8c86258d4c0e8ed0ab386edf
2015-11-04 12:28:48 +01:00
..
socketprocess Update copyright headers 2015-02-11 06:49:51 +00:00
test
.gitignore
BLACKLIST Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
qlocalsocket.pro
tst_qlocalsocket.cpp Merge remote-tracking branch 'origin/5.5' into 5.6 2015-11-04 12:28:48 +01:00