diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-23 08:54:52 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-23 08:54:52 (GMT) |
| commit | 6e9015a71645fa5da09cbd6240b45e1472a2c1ea (patch) | |
| tree | bf7d1da9a3440926ab9fdc56b9691438bd0db62d /src/gui/styles/qstylesheetstyle.cpp | |
| parent | 1ef21425463204ff60defb9ca97813ff07db2149 (diff) | |
| parent | 58d6be490b6ede5ad339ca4c938c59418f116b2a (diff) | |
| download | Qt-6e9015a71645fa5da09cbd6240b45e1472a2c1ea.zip Qt-6e9015a71645fa5da09cbd6240b45e1472a2c1ea.tar.gz Qt-6e9015a71645fa5da09cbd6240b45e1472a2c1ea.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index b36294a..c550938 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -5743,6 +5743,13 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c return positionRect(w, subRule, subRule2, pe, opt->rect, opt->direction); } +#ifndef QT_NO_TOOLBAR + case SE_ToolBarHandle: + if (hasStyleRule(w, PseudoElement_ToolBarHandle)) + return ParentStyle::subElementRect(se, opt, w); + break; +#endif //QT_NO_TOOLBAR + default: break; } |