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
..
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-04-13 06:55:37 +02:00