Liang Qi cc74452d6d Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure src/plugins/platforms/winrt/qwinrtclipboard.cpp Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9		2016-08-29 08:13:40 +02:00
..
.gitignore	…
common.h	Updated license headers	2016-01-21 18:55:18 +00:00
qtextdocument.pro	…
test.css	Ensure that CSS rules are inherited from the parent tags	2015-03-25 11:55:47 +00:00
tst_qtextdocument.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-29 08:13:40 +02:00