50908f023d
Conflicts: src/plugins/platforms/ios/qiosviewcontroller.mm Change-Id: I2dda31867cbc79ea7fe965f52afb518aefa4ad20 |
||
---|---|---|
.. | ||
.gitignore | ||
common.h | ||
qtextdocument.pro | ||
test.css | ||
tst_qtextdocument.cpp |
50908f023d
Conflicts: src/plugins/platforms/ios/qiosviewcontroller.mm Change-Id: I2dda31867cbc79ea7fe965f52afb518aefa4ad20 |
||
---|---|---|
.. | ||
.gitignore | ||
common.h | ||
qtextdocument.pro | ||
test.css | ||
tst_qtextdocument.cpp |