Liang Qi b7ac036b72 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/network/socket/qabstractsocket.cpp src/plugins/platforms/winrt/qwinrtscreen.cpp src/sql/drivers/mysql/qsql_mysql.cpp Change-Id: Ifb73623d09f53340ee5e10283f1f86b580998902		2015-10-13 23:03:51 +02: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.5' into 5.6	2015-10-13 23:03:51 +02:00