diff options
| author | Timothy Pearson <[email protected]> | 2012-08-07 01:31:43 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-08-07 01:31:43 -0500 |
| commit | 58451e41d9ecfb405f5dd2718444ac78e8d51c8b (patch) | |
| tree | 1b52d26a8b3ffe81516df83896285ebfa843d849 /src/widgets/qlabel.cpp | |
| parent | 0008bc5bcd95694b38b0d0322aac2ea6fdb21298 (diff) | |
| download | qt3-58451e41d9ecfb405f5dd2718444ac78e8d51c8b.tar.gz qt3-58451e41d9ecfb405f5dd2718444ac78e8d51c8b.zip | |
Extend TQStyle API further and bump Qt version number
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 40f2b38..ff2e7bc 100644 --- a/src/widgets/qlabel.cpp +++ b/src/widgets/qlabel.cpp @@ -838,8 +838,9 @@ void QLabel::drawContents( QPainter *p ) } #endif int alignment = align; - if ((align & ShowPrefix) && !style().styleHint(QStyle::SH_UnderlineAccelerator, this)) + if ((align & ShowPrefix) && ((!style().styleHint(QStyle::SH_UnderlineAccelerator, this)) || ((style().styleHint(QStyle::SH_HideUnderlineAcceleratorWhenAltUp, this)) && (!style().acceleratorsShown())))) { alignment |= NoAccel; + } // ordinary text or pixmap label style().drawItem( p, cr, alignment, colorGroup(), isEnabled(), pix, ltext ); |