diff options
| author | Darrell Anderson <[email protected]> | 2012-08-08 15:38:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-08 15:38:38 -0500 |
| commit | a236ea2ad383387255621fc8eaddc3c5d17f1e30 (patch) | |
| tree | ecacdf1f8c9c02f545e06f8a430a145998fe11ea /src/widgets/qtoolbox.cpp | |
| parent | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (diff) | |
| parent | 47132557a4c58d4ad69bc2898bb2bd9c424b3b64 (diff) | |
| download | qt3-a236ea2ad383387255621fc8eaddc3c5d17f1e30.tar.gz qt3-a236ea2ad383387255621fc8eaddc3c5d17f1e30.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/widgets/qtoolbox.cpp')
| -rw-r--r-- | src/widgets/qtoolbox.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index 64fc148..b48f416 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -240,8 +240,9 @@ void QToolBoxButton::drawButton( QPainter *p ) fill = &cg.color( QPalette::foregroundRoleFromMode( tb->backgroundMode() ) ); int alignment = AlignLeft | AlignVCenter | ShowPrefix; - if (!style().styleHint(QStyle::SH_UnderlineAccelerator, this)) + if ((!style().styleHint(QStyle::SH_UnderlineAccelerator, this)) || ((style().styleHint(QStyle::SH_HideUnderlineAcceleratorWhenAltUp, this)) && (!style().acceleratorsShown()))) { alignment |= NoAccel; + } style().drawItem( p, tr, alignment, cg, isEnabled(), 0, txt, -1, fill ); |