diff options
| author | Jens Bache-Wiig <jbache@trolltech.com> | 2009-09-09 13:09:34 (GMT) |
|---|---|---|
| committer | Jens Bache-Wiig <jbache@trolltech.com> | 2009-09-09 13:14:20 (GMT) |
| commit | c5c58c2368f71c5d0067c9389c8ad04c41b66db5 (patch) | |
| tree | e974295bfded180194d63ab2ffd11a5cd44d0094 /src/gui/text/qfont.h | |
| parent | 4cc9fcac3ef66987b95a5589f10f3a0d82a778f4 (diff) | |
| download | Qt-c5c58c2368f71c5d0067c9389c8ad04c41b66db5.zip Qt-c5c58c2368f71c5d0067c9389c8ad04c41b66db5.tar.gz Qt-c5c58c2368f71c5d0067c9389c8ad04c41b66db5.tar.bz2 | |
Fix regression in Command link button font size
Since vista style polish sets the font on polish, the
check for WA_SetFont will succeed, hence we never set the
actual font. I replaced the check with a full resolve.
However since the resolve would clear the resolve_mask,
from the widget font it has to be restored manually
so that QPainter:setFont can resolve it later.
Task-number: QTBUG-4646
Reviewed-by: trond
Diffstat (limited to 'src/gui/text/qfont.h')
| -rw-r--r-- | src/gui/text/qfont.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index ef91983..d73e1c4 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -309,6 +309,7 @@ private: friend class QPicturePaintEngine; friend class QPainterReplayer; friend class QPaintBufferEngine; + friend class QCommandLinkButtonPrivate; #ifndef QT_NO_DATASTREAM friend Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QFont &); |