From 58451e41d9ecfb405f5dd2718444ac78e8d51c8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 7 Aug 2012 01:31:43 -0500 Subject: Extend TQStyle API further and bump Qt version number --- src/widgets/qlabel.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/widgets/qlabel.cpp') 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 ); -- cgit v1.2.3