diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 10:08:26 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 10:08:26 +0200 |
| commit | e3fcbf32285fe5033260affc3088deaa6fad6fc7 (patch) | |
| tree | 1b9617ce375fafefa3b709d751d264bf0a239454 /src/gui/styles/qwindowsstyle.cpp | |
| parent | 3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf (diff) | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
Merge earth-team into origin/4.8
Conflicts:
configure
Diffstat (limited to 'src/gui/styles/qwindowsstyle.cpp')
| -rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index f61fe676f5..754486ee16 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -1858,8 +1858,8 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai } QRect vCheckRect = visualRect(opt->direction, menuitem->rect, QRect(menuitem->rect.x(), menuitem->rect.y(), checkcol, menuitem->rect.height())); - if (checked) { - if (act && !dis) { + if (!menuitem->icon.isNull() && checked) { + if (act) { qDrawShadePanel(p, vCheckRect, menuitem->palette, true, 1, &menuitem->palette.brush(QPalette::Button)); |