Allow QTextCharFormat::setFont() to skip unresolved font props
authorKonstantin Ritt <ritt.ks@gmail.com>
Fri, 17 Jan 2014 15:38:55 +0000 (17:38 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 30 Jan 2014 23:24:48 +0000 (00:24 +0100)
commitf26928cccf7e0fd9f06236476f2a6b52151e5dca
tree9464f786b5c27d1b5669e0c09eb87414f9529d64
parentf6723cf0d479823a34e874bc4cc9ff43e040793a
Allow QTextCharFormat::setFont() to skip unresolved font props

This makes the font merging possible and solves an issue
with the default font properties inheritance when used
in conjunction with QTextFormatCollection.

Change-Id: If8b543c011122dde9f086f5d696df3b042f7b90c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/gui/text/qtextformat.cpp
src/gui/text/qtextformat.h
src/gui/text/qtexthtmlparser.cpp
tests/auto/gui/text/qtextformat/qtextformat.pro
tests/auto/gui/text/qtextformat/tst_qtextformat.cpp