From d6d662bba534ba7dc7580c30b62bc97806590aa5 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Wed, 26 Aug 2020 16:40:56 +0200 Subject: Rename QStyleOptionMenuItem::tabWidth to reservedShortcutWidth As per ### Qt 6 comment, and the documentation for the variable. Change-Id: I58df784a72129dc97c5f13eb54e34cb7feb9748c Reviewed-by: Richard Moe Gustavsen --- src/widgets/widgets/qmenu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/widgets/widgets/qmenu.cpp') diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index eba20445aa..e63a7edc4a 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -961,7 +961,7 @@ void QMenuPrivate::drawScroller(QPainter *painter, QMenuPrivate::ScrollerTearOff menuOpt.state = QStyle::State_None; menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; menuOpt.rect = rect; menuOpt.menuItemType = QStyleOptionMenuItem::Scroller; menuOpt.state |= QStyle::State_Enabled; @@ -986,7 +986,7 @@ void QMenuPrivate::drawTearOff(QPainter *painter, const QRect &rect) menuOpt.state = QStyle::State_None; menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; menuOpt.rect = rect; menuOpt.menuItemType = QStyleOptionMenuItem::TearOff; if (tearoffHighlighted) @@ -1613,7 +1613,7 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action) } #endif option->text = textAndAccel; - option->tabWidth = d->tabWidth; + option->reservedShortcutWidth = d->tabWidth; option->maxIconWidth = d->maxIconWidth; option->menuRect = rect(); } @@ -2784,7 +2784,7 @@ void QMenu::paintEvent(QPaintEvent *e) menuOpt.state = QStyle::State_None; menuOpt.checkType = QStyleOptionMenuItem::NotCheckable; menuOpt.maxIconWidth = 0; - menuOpt.tabWidth = 0; + menuOpt.reservedShortcutWidth = 0; style()->drawPrimitive(QStyle::PE_PanelMenu, &menuOpt, &p, this); //calculate the scroll up / down rect -- cgit v1.2.3