Liang Qi 50908f023d Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: src/plugins/platforms/ios/qiosviewcontroller.mm Change-Id: I2dda31867cbc79ea7fe965f52afb518aefa4ad20		2016-09-22 07:28:34 +02:00
..
.gitignore
common.h	Updated license headers	2016-01-21 18:55:18 +00:00
qtextdocument.pro	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
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.7' into 5.8	2016-09-22 07:28:34 +02:00