qt5base-lts/examples/widgets/gestures
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
..
imagegestures Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
gestures.pro Doc: corrected link/example errors 2014-01-31 16:18:07 +01:00