diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-15 04:15:40 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-15 04:15:40 (GMT) |
| commit | 3e056e3c1da450d3b879b68cdfa15bc5959ffbc8 (patch) | |
| tree | 53a77ae62bb9ccc8eca9e72c5419c1bd0d61c869 /src/gui/styles/qcommonstyle.cpp | |
| parent | 9861d14de8f77d90a40163298699c86a986b3f6a (diff) | |
| parent | 272c26b6daf3e48c3f338f4c78cc9e694ac7993f (diff) | |
| download | Qt-3e056e3c1da450d3b879b68cdfa15bc5959ffbc8.zip Qt-3e056e3c1da450d3b879b68cdfa15bc5959ffbc8.tar.gz Qt-3e056e3c1da450d3b879b68cdfa15bc5959ffbc8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index c0899f8..6972803 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -1664,6 +1664,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, if (!styleHint(SH_UnderlineShortcut, opt, widget)) alignment |= Qt::TextHideMnemonic; rect.translate(shiftX, shiftY); + p->setFont(toolbutton->font); drawItemText(p, rect, alignment, toolbutton->palette, opt->state & State_Enabled, toolbutton->text, QPalette::ButtonText); |