whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/network/socket/qlocalsocket
History
Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	examples/qtestlib/tutorial5/containers.cpp
	examples/widgets/tools/tools.pro
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/network/kernel/qdnslookup_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	tools/configure/configureapp.cpp

Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
 		2016-05-06 15:36:44 +02:00
..
socketprocess Updated license headers 2016-01-21 18:55:18 +00:00
test QtNetwork tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2014-02-25 16:47:13 +01: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.6' into 5.7 2016-05-06 15:36:44 +02:00