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
..
apache_org.html	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
htmlinfo.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
resources.qrc	QtXml/htmlnfo example: Remove Nokia-related HTML demo file.	2016-04-06 18:25:29 +00:00
simpleexample.html	Update copyright headers	2015-02-11 06:49:51 +00:00
trolltech_com.html	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
w3c_org.html	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
youtube_com.html	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00