diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:41:05 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-20 16:41:05 (GMT) |
| commit | f9d26f0bebd5bcc32d15c4a627251c44cf78389e (patch) | |
| tree | 64a13ad1e625f35811286d8d468fe9f504a29df8 /src/gui/styles | |
| parent | 64fb80c40cb0fd978923d1931670ba70466bc76e (diff) | |
| parent | 56a8e78869325453010fb6c41a5e2b9e6f8f1c95 (diff) | |
| download | Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.zip Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.gz Qt-f9d26f0bebd5bcc32d15c4a627251c44cf78389e.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 64edd76..2478f20 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -5151,7 +5151,8 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex arrowOpt.state = tb->state; arrowOpt.palette = tb->palette; drawPrimitive(PE_IndicatorArrowDown, &arrowOpt, p, widget); - } else if (tb->features & QStyleOptionToolButton::HasMenu) { + } else if ((tb->features & QStyleOptionToolButton::HasMenu) + && (tb->toolButtonStyle != Qt::ToolButtonTextOnly && !tb->icon.isNull())) { drawToolbarButtonArrow(tb->rect, tds, cg); } if (tb->state & State_On) { |