projects / platform / upstream / qtdeclarative.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 74e2ed4) | patch
qquicktext: Fix using CSS line-height with RichText
authorKai Uwe Broulik <kde@privat.broulik.de>
Fri, 10 Jul 2015 13:46:55 +0000 (15:46 +0200)
committerKai Uwe Broulik <kde@privat.broulik.de>
Mon, 20 Jul 2015 10:33:41 +0000 (10:33 +0000)
commit2c2eb24975bbf5c698d4d23c6a5060729339d9f3
tree0e04d532031fedc2c0d73e015fc6a2cb16687ee7tree | snapshot
parent74e2ed4841ac35c9af806eeb0555d492ffc82cb8commit | diff
qquicktext: Fix using CSS line-height with RichText

Only if lineHeight has explicitly been set it will override the block format.

Task-number: QTBUG-45204
Change-Id: I6e0d6dd70460cbf436dda3e5640bb9b1d16d7e5a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
src/quick/items/qquicktext.cpp diff | blob | history
src/quick/items/qquicktext_p_p.h diff | blob | history
Domain: UI Framework / Qt;