Liang Qi b94773c9c8 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: config.tests/unix/compile.test src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/testlib/qtestcase.cpp src/testlib/qtestcase.qdoc Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d		2016-04-13 06:55:37 +02: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	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-13 06:55:37 +02: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