diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-26 16:40:56 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-27 22:29:12 +0200 |
| commit | d6d662bba534ba7dc7580c30b62bc97806590aa5 (patch) | |
| tree | 1cf8bf17b2b9fb2d3ba8ccab551cddbae2706915 /src/plugins/styles/windowsvista | |
| parent | b63e99d04130c524d860b572f51f9392ab61985b (diff) | |
Rename QStyleOptionMenuItem::tabWidth to reservedShortcutWidth
As per ### Qt 6 comment, and the documentation for the variable.
Change-Id: I58df784a72129dc97c5f13eb54e34cb7feb9748c
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/plugins/styles/windowsvista')
| -rw-r--r-- | src/plugins/styles/windowsvista/qwindowsvistastyle.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/styles/windowsvista/qwindowsxpstyle.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp index 30b3786a80..7ad5fbe34d 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle.cpp @@ -1198,7 +1198,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption int x, y, w, h; menuitem->rect.getRect(&x, &y, &w, &h); - int tab = menuitem->tabWidth; + int tab = menuitem->reservedShortcutWidth; bool dis = !(menuitem->state & State_Enabled); bool checked = menuitem->checkType != QStyleOptionMenuItem::NotCheckable ? menuitem->checked : false; diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp index 6183e32af2..d00413538b 100644 --- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp @@ -2130,7 +2130,7 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op case CE_MenuItem: if (const QStyleOptionMenuItem *menuitem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) { - int tab = menuitem->tabWidth; + int tab = menuitem->reservedShortcutWidth; bool dis = !(menuitem->state & State_Enabled); bool act = menuitem->state & State_Selected; bool checkable = menuitem->menuHasCheckableItems; |