From f9057f290bc89884d32ec88bddc8de6e0a3b3f7f Mon Sep 17 00:00:00 2001
From: Janne Koskinen <janne.p.koskinen@digia.com>
Date: Wed, 8 Dec 2010 12:25:29 +0200
Subject: QLabel wordwrap to respect maximumSize

80 characters width can be longer than maximum size of QLabel.
Restrict to max size.

Task-number: QT-4354
Reviewed-by: Sami Merila
---
 src/gui/widgets/qlabel.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp
index 42be03b..011b07a 100644
--- a/src/gui/widgets/qlabel.cpp
+++ b/src/gui/widgets/qlabel.cpp
@@ -682,7 +682,7 @@ QSize QLabelPrivate::sizeForWidth(int w) const
 
             bool tryWidth = (w < 0) && (align & Qt::TextWordWrap);
             if (tryWidth)
-                w = fm.averageCharWidth() * 80;
+                w = qMin(fm.averageCharWidth() * 80, q->maximumSize().width());
             else if (w < 0)
                 w = 2000;
             w -= (hextra + contentsMargin.width());
-- 
cgit v0.12