diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-07 01:32:24 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-07 01:32:24 -0500 |
| commit | 74dac1c21d3ad1f446874fd29f7e670e77a196b5 (patch) | |
| tree | 8ff20c2c06d337cdcec36a32afc8bfd9f4120064 /src/widgets/qlabel.cpp | |
| parent | c73edd8f63289c619c20a8e5d031a24d870c62ee (diff) | |
| download | tqt3-74dac1c21d3ad1f446874fd29f7e670e77a196b5.tar.gz tqt3-74dac1c21d3ad1f446874fd29f7e670e77a196b5.zip | |
Automated update from Qt3
Diffstat (limited to 'src/widgets/qlabel.cpp')
| -rw-r--r-- | src/widgets/qlabel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp index c78b99104..314bfe219 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/qlabel.cpp @@ -838,8 +838,9 @@ void TQLabel::drawContents( TQPainter *p ) } #endif int alignment = align; - if ((align & ShowPrefix) && !style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) + if ((align & ShowPrefix) && ((!style().styleHint(TQStyle::SH_UnderlineAccelerator, this)) || ((style().styleHint(TQStyle::SH_HideUnderlineAcceleratorWhenAltUp, this)) && (!style().acceleratorsShown())))) { alignment |= NoAccel; + } // ordinary text or pixmap label style().drawItem( p, cr, alignment, colorGroup(), isEnabled(), pix, ltext ); |