diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-02 11:36:43 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-02 11:36:54 (GMT) |
| commit | e403fd643f5b7cdd215689b566067c19cf70b4c3 (patch) | |
| tree | b43d23bf0cc7b93b1867efe4c2377d82137aed9f /src/gui/styles/qstylesheetstyle.cpp | |
| parent | 1d440cf00ded21432ca4be36bf5be60bbddf87d1 (diff) | |
| parent | 016c06f8988c50f0f8309b1b5054ea99ecd1bc6c (diff) | |
| download | Qt-e403fd643f5b7cdd215689b566067c19cf70b4c3.zip Qt-e403fd643f5b7cdd215689b566067c19cf70b4c3.tar.gz Qt-e403fd643f5b7cdd215689b566067c19cf70b4c3.tar.bz2 | |
Merge origin/4.6 into team-widgets/4.6
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 2ae9f6a..32f259b 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -4327,7 +4327,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op QRenderRule subRule = renderRule(w, opt, PseudoElement_TabWidgetPane); if (subRule.hasNativeBorder()) { subRule.drawBackground(p, opt->rect); - QStyleOptionTabWidgetFrame frmCopy(*frm); + QStyleOptionTabWidgetFrameV2 frmCopy(*frm); subRule.configurePalette(&frmCopy.palette, QPalette::WindowText, QPalette::Window); baseStyle()->drawPrimitive(pe, &frmCopy, p, w); } else { |