Liang Qi 4159ee8405 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: config.tests/unix/ptrsize.test configure src/corelib/global/qnamespace.h src/network/socket/qabstractsocket.cpp tests/auto/other/networkselftest/networkselftest.pro Change-Id: Ic78abb4a34f9068567cea876861d4220f5a07672		2015-11-04 20:18:14 +01:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qlistview.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
tst_qlistview.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00