diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-19 10:04:39 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-19 10:04:39 (GMT) |
| commit | a226143eeda6771efc4f0df6955351336735cb60 (patch) | |
| tree | a279f87d74f5929e36fe6a3aa5e4f4d843b32458 /src/gui/text/qtextcontrol.cpp | |
| parent | c02ad51733d0a2885ddb39cb7e3b09355ab97213 (diff) | |
| parent | ffbce9839f8be5c2f21cc66b617dbeb0a47af269 (diff) | |
| download | Qt-a226143eeda6771efc4f0df6955351336735cb60.zip Qt-a226143eeda6771efc4f0df6955351336735cb60.tar.gz Qt-a226143eeda6771efc4f0df6955351336735cb60.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 3d34687..32b1df9 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -2908,7 +2908,7 @@ QAbstractTextDocumentLayout::PaintContext QTextControl::getPaintContext(QWidget if (widget) style = widget->style(); style->styleHint(QStyle::SH_TextControl_FocusIndicatorTextCharFormat, &opt, widget, &ret); - selection.format = qVariantValue<QTextFormat>(ret.variant).toCharFormat(); + selection.format = qvariant_cast<QTextFormat>(ret.variant).toCharFormat(); } else { QPalette::ColorGroup cg = d->hasFocus ? QPalette::Active : QPalette::Inactive; selection.format.setBackground(ctx.palette.brush(cg, QPalette::Highlight)); |