diff options
| author | aavit <qt-info@nokia.com> | 2011-09-27 07:11:18 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-09-27 07:11:18 (GMT) |
| commit | fef5d7b0cbfba93ca108ce9f0785826c0a4ff829 (patch) | |
| tree | 1676c6739ddbdd029ac6083b1afbef3f0e5fd7e3 /src/gui/widgets/qlabel.cpp | |
| parent | e05734987594f0e54f58a2ab3037cdf4956e9036 (diff) | |
| parent | d7489680a80df5d77fbc032b1bc656a8dab1a986 (diff) | |
| download | Qt-fef5d7b0cbfba93ca108ce9f0785826c0a4ff829.zip Qt-fef5d7b0cbfba93ca108ce9f0785826c0a4ff829.tar.gz Qt-fef5d7b0cbfba93ca108ce9f0785826c0a4ff829.tar.bz2 | |
Merge remote-tracking branch 'qt-mainline/4.8'
Diffstat (limited to 'src/gui/widgets/qlabel.cpp')
| -rw-r--r-- | src/gui/widgets/qlabel.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp index ab88f38..c0be3e1 100644 --- a/src/gui/widgets/qlabel.cpp +++ b/src/gui/widgets/qlabel.cpp @@ -59,6 +59,10 @@ #include <qaccessible.h> #endif +#ifdef Q_OS_SYMBIAN +#include "qt_s60_p.h" +#endif + QT_BEGIN_NAMESPACE /*! @@ -698,7 +702,11 @@ QSize QLabelPrivate::sizeForWidth(int w) const bool tryWidth = (w < 0) && (align & Qt::TextWordWrap); if (tryWidth) +#ifdef Q_OS_SYMBIAN + w = qMin(S60->clientRect().Width(), q->maximumSize().width()); +#else w = qMin(fm.averageCharWidth() * 80, q->maximumSize().width()); +#endif else if (w < 0) w = 2000; w -= (hextra + contentsMargin.width()); |