diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 17:31:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-22 17:31:39 (GMT) |
| commit | 341304328e0d1f0e6a3879f8592631078b6ec558 (patch) | |
| tree | 669ec77b3fedeee21b11136c4a11ba317bc16301 /src/gui/styles/qstylesheetstyle.cpp | |
| parent | dba104808411c7eb4321cb13333101c6335b3621 (diff) | |
| parent | d9838f300b652fe58c8c5af7097b236d93eb9725 (diff) | |
| download | Qt-341304328e0d1f0e6a3879f8592631078b6ec558.zip Qt-341304328e0d1f0e6a3879f8592631078b6ec558.tar.gz Qt-341304328e0d1f0e6a3879f8592631078b6ec558.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize QWidget benchmarks.
Stylesheet: Fix size specified in QToolbar::handle
fix crash on Windows CE on WM_SETTINGCHANGE
Stabilize style sheet benchmarks.
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; } |