diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 14:17:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 14:17:28 (GMT) |
| commit | 89be252042955a01a17baa91f2d318cbb2d2a5a4 (patch) | |
| tree | f88147ff02689b62ad40e266cb27f3886fba7c58 /src | |
| parent | 7f964ea0027f749bc94582163fadd0d5d35aaccc (diff) | |
| parent | 1022d67cde2c8c45c304612732e0399c66f8a04a (diff) | |
| download | Qt-89be252042955a01a17baa91f2d318cbb2d2a5a4.zip Qt-89be252042955a01a17baa91f2d318cbb2d2a5a4.tar.gz Qt-89be252042955a01a17baa91f2d318cbb2d2a5a4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed QFont to respect the italics constructor flag.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfont.cpp | 3 |
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; |