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
..
qmacstyle	Updated license headers	2016-01-21 18:55:18 +00:00
qstyle	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-07 10:47:20 +02:00
qstyleoption	Updated license headers	2016-01-21 18:55:18 +00:00
qstylesheetstyle	Updated license headers	2016-01-21 18:55:18 +00:00
styles.pro	fix usage of wince scope	2015-06-05 10:29:10 +00:00