qt6-bb10/tests/auto/widgets
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
..
dialogs Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
effects Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
gestures Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
graphicsview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
itemviews Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
kernel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
styles Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
util Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
widgets.pro