summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond.kjernasen@nokia.com>2010-05-12 12:51:00 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-05-12 13:17:29 (GMT)
commit1022d67cde2c8c45c304612732e0399c66f8a04a (patch)
tree7cccfb0507a13f062b2ea46faf26d296f2a01643 /src
parenta50eed92125dc366163dc09164912eaf105d513f (diff)
downloadQt-1022d67cde2c8c45c304612732e0399c66f8a04a.zip
Qt-1022d67cde2c8c45c304612732e0399c66f8a04a.tar.gz
Qt-1022d67cde2c8c45c304612732e0399c66f8a04a.tar.bz2
Fixed QFont to respect the italics constructor flag.
Creating a QFont with the constructor that takes the italic bool flag didn't work properly, since the property wasn't set to be resolved. It may be that the property should *always* be resolved, but to minimize impact, it's only done now if you pass in 'true' for italics. Reviewed-by: Eskil
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qfont.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index b349bcf..b02a42e 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -805,6 +805,9 @@ QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
resolve_mask |= QFont::WeightResolved | QFont::StyleResolved;
}
+ if (italic)
+ resolve_mask |= QFont::StyleResolved;
+
d->request.family = family;
d->request.pointSize = qreal(pointSize);
d->request.pixelSize = -1;