From 6797413db25b54638c879020e2af552f6e61bcf6 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 6 Dec 2012 08:37:10 +0100 Subject: Remove some dead code from QLabel::paintEvent() The code removed was in a if (d->control) block and therefore d->control was always going to be true thus rendering the nested if invalid. The case that this would account for is already handled in the else for the parent if so this code is in effect not needed. Change-Id: I799383e238560a8a8e3d7dc073d3b1ee74269f90 Reviewed-by: Friedemann Kleint Reviewed-by: Marc Mutz Reviewed-by: Jens Bache-Wiig --- src/widgets/widgets/qlabel.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/widgets/widgets/qlabel.cpp') diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 3b3d15f6d0..9465acfdad 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -1032,20 +1032,6 @@ void QLabel::paintEvent(QPaintEvent *) d->ensureTextLayouted(); QAbstractTextDocumentLayout::PaintContext context; - if (!isEnabled() && !d->control && - // We cannot support etched for rich text controls because custom - // colors and links will override the light palette - style->styleHint(QStyle::SH_EtchDisabledText, &opt, this)) { - context.palette = opt.palette; - context.palette.setColor(QPalette::Text, context.palette.light().color()); - painter.save(); - painter.translate(lr.x() + 1, lr.y() + 1); - painter.setClipRect(lr.translated(-lr.x() - 1, -lr.y() - 1)); - QAbstractTextDocumentLayout *layout = d->control->document()->documentLayout(); - layout->draw(&painter, context); - painter.restore(); - } - // Adjust the palette context.palette = opt.palette; -- cgit v1.2.3