Liang Qi ee0951d69b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/network/access/qftp.cpp src/widgets/itemviews/qheaderview.cpp src/widgets/itemviews/qlistview.cpp tests/auto/network/access/qftp/tst_qftp.cpp Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9		2016-04-07 10:47:20 +02:00
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qgraphicslinearlayout.pro	widget/graphicsview: Do not run tests showing windows in parallel.	2013-06-03 13:48:41 +02:00
tst_qgraphicslinearlayout.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-07 10:47:20 +02:00