whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/network/socket
History
Liang Qi e32f1a4d61 Merge remote-tracking branch 'origin/5.6' into 5.7 
And blacklisted a few tests in tst_QUdpSocket.

Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtNative.java
	src/corelib/global/qglobal.cpp
	src/corelib/global/qsystemdetection.h
	src/corelib/io/qfileselector.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
	tests/auto/network/socket/qudpsocket/BLACKLIST

Task-number: QTBUG-54205
Change-Id: I11dd1c90186eb1b847d45be87a26041f61d89ef6
 		2016-06-20 08:00:26 +02:00
..
platformsocketengine Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qabstractsocket Updated license headers 2016-01-21 18:55:18 +00:00
qhttpsocketengine Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
qlocalsocket Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qsocks5socketengine Updated license headers 2016-01-21 18:55:18 +00:00
qtcpserver Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 09:18:05 +02:00
qtcpsocket Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
qudpsocket Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-20 08:00:26 +02:00
socket.pro WinRT: Fixed compilation of network autotests and benchmarks 2013-12-06 15:06:47 +01:00