whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/network/kernel
History
Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
	src/dbus/qdbusconnection_p.h
	src/dbus/qdbusintegrator.cpp
	src/dbus/qdbusintegrator_p.h
	tests/auto/corelib/io/qdir/qdir.pro
	tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp

Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc
 		2016-01-26 16:27:28 +01:00
..
qauthenticator Updated license headers 2016-01-21 18:55:18 +00:00
qdnslookup Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qdnslookup_appless Updated license headers 2016-01-21 18:55:18 +00:00
qhostaddress Updated license headers 2016-01-21 18:55:18 +00:00
qhostinfo Add Intel copyright to files that Intel has had non-trivial contribution 2016-01-21 22:44:21 +00:00
qnetworkaddressentry Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkinterface Merge remote-tracking branch 'origin/5.6' into dev 2016-01-26 16:27:28 +01:00
qnetworkproxy Updated license headers 2016-01-21 18:55:18 +00:00
qnetworkproxyfactory Updated license headers 2016-01-21 18:55:18 +00:00
kernel.pro Disable tst_qhostinfo on OS X. 2014-10-10 13:15:43 +02:00