diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-06 17:01:06 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-08 16:41:38 +0200 |
| commit | 729f1ab9a0b9fe6ffdefc02df490ec546db38d72 (patch) | |
| tree | a2681089a8c890ca6d072cf3f4fee49a2932b28d /src/widgets/styles/qstylesheetstyle.cpp | |
| parent | 6e63d65e5aa73f10b0e36e44f214f274a5ab079f (diff) | |
Merge QStyleOptionTabV4 into QStyleOptionTab
We don't need the subclass any more now that we can break ABI.
Merge it back into the "main" style option class, like already
happened during Qt 4->5.
Change-Id: Iba6d3df5f87b0c96f01746260f0a93951dad0e27
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 06116ed295..32f86e5b5a 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -6015,11 +6015,11 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c QRenderRule subRule = renderRule(w, opt, PseudoElement_TabBarTab); if (subRule.hasBox() || !subRule.hasNativeBorder()) { if (se == SE_TabBarTabText) { - if (const QStyleOptionTabV4 *tab = qstyleoption_cast<const QStyleOptionTabV4 *>(opt)) { + if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) { const QTabBar *bar = qobject_cast<const QTabBar *>(w); const QRect optRect = bar && tab->tabIndex != -1 ? bar->tabRect(tab->tabIndex) : opt->rect; const QRect r = positionRect(w, subRule, PseudoElement_TabBarTab, optRect, opt->direction); - QStyleOptionTabV4 tabCopy(*tab); + QStyleOptionTab tabCopy(*tab); tabCopy.rect = subRule.contentsRect(r); return ParentStyle::subElementRect(se, &tabCopy, w); } |