diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-22 09:28:05 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-05-22 09:28:05 (GMT) |
commit | d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d (patch) | |
tree | ba6df139b3c343bb9352423770a99f218f62bd45 /src/gui/widgets/qcommandlinkbutton.cpp | |
parent | 72798fc4dfc1af73cde542f9017dfec5cb020173 (diff) | |
parent | 8ad5020940f10d4ecc5c5e8b3b9656531cb84ef3 (diff) | |
download | Qt-d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d.zip Qt-d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d.tar.gz Qt-d0ac49ec731f0781ba48f8f5d8ce04e19ce0010d.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qvariant_p.h
src/corelib/tools/tools.pri
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicswidget.h
src/gui/gui.pro
Diffstat (limited to 'src/gui/widgets/qcommandlinkbutton.cpp')
-rw-r--r-- | src/gui/widgets/qcommandlinkbutton.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/widgets/qcommandlinkbutton.cpp b/src/gui/widgets/qcommandlinkbutton.cpp index 13ee6af..92d89a1 100644 --- a/src/gui/widgets/qcommandlinkbutton.cpp +++ b/src/gui/widgets/qcommandlinkbutton.cpp @@ -140,10 +140,12 @@ QFont QCommandLinkButtonPrivate::titleFont() const Q_Q(const QCommandLinkButton); QFont font = q->font(); if (usingVistaStyle()) { - font.setPointSizeF(12.0); + if (!q->testAttribute(Qt::WA_SetFont)) + font.setPointSizeF(12.0); } else { font.setBold(true); - font.setPointSizeF(9.0); + if (!q->testAttribute(Qt::WA_SetFont)) + font.setPointSizeF(9.0); } return font; } @@ -152,7 +154,8 @@ QFont QCommandLinkButtonPrivate::descriptionFont() const { Q_Q(const QCommandLinkButton); QFont font = q->font(); - font.setPointSizeF(9.0); + if (!q->testAttribute(Qt::WA_SetFont)) + font.setPointSizeF(9.0); return font; } |