diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-08 00:35:06 (GMT) |
|---|---|---|
| committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-08 00:35:06 (GMT) |
| commit | 693695e5677422625d555943586d41fbd9dbe971 (patch) | |
| tree | 17e70dcb11f009398b083cb0361982ca32f2ac6e /src/gui/text | |
| parent | f4fa50c25aea68b7696ad7de289d93facac9f3e5 (diff) | |
| parent | 4bb098ed9449bd3b2798000bc5394bda98c9165f (diff) | |
| download | Qt-693695e5677422625d555943586d41fbd9dbe971.zip Qt-693695e5677422625d555943586d41fbd9dbe971.tar.gz Qt-693695e5677422625d555943586d41fbd9dbe971.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qcssparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index f252444..a38f276 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -1171,7 +1171,7 @@ static void parseShorthandFontProperty(const QVector<Value> &values, QFont *font { font->setStyle(QFont::StyleNormal); font->setWeight(QFont::Normal); - *fontSizeAdjustment = 0; + *fontSizeAdjustment = -255; int i = 0; while (i < values.count()) { |