Liang Qi 69ef0481fc Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp Change-Id: I6f3878b204464313aa2f9d988d3b35121d4d9867		2016-08-05 08:58:48 +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-08-05 08:58:48 +02:00