Liang Qi 6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/widgets/styles/qgtkstyle_p.cpp tests/auto/corelib/io/qtextstream/test/test.pro tests/auto/corelib/plugin/plugin.pro Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b		2016-03-21 09:02:57 +01: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-03-21 09:02:57 +01:00