summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorChris Adams <chris.adams@jollamobile.com>2012-11-27 12:26:53 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-29 11:17:18 +0100
commit3a0cec6525be6bf843c597c19693785e2c893ee9 (patch)
treeff77035bc554e29c5acd05f6977841b005efdf07 /src/imports
parent01928c91ff0ae76cdb02f50af3c62368e28cafb6 (diff)
Ensure QDeclarativeTextLayout uses the correct pen
When a styled text specifies a font region with some color set, QDeclarativeTextLayout used to revert to using a default-constructed (black-colored) pen for text occurring after the </font> tag, rather than the "default" (property-defined) color. This commit ensures that the correct pen is used, by setting the pen of the "inert" painter to be an invalid color rather than a default constructed pen. It then detects when the current pen transitions back to this invalid pen, and switches back to using the default color. Task-number: QTBUG-28135 Change-Id: I6bcc43fbcf7fb2c680959d27b1422364ebb473ae Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions