diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 20:06:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 20:06:36 (GMT) |
| commit | 4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae (patch) | |
| tree | 6ac745fc40c41b0ee43824a8211847059157299c /src/gui/text/qtextlist.cpp | |
| parent | 8acb9028787c75682055afe2a5b494c78b8f944d (diff) | |
| parent | 8ffb49a4ac68b1c243b25343053e6e99f97ec2e7 (diff) | |
| download | Qt-4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae.zip Qt-4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae.tar.gz Qt-4ad12bb65aa46b3ba1cd8aa43716c2832842a2ae.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes crash in QGraphicsItem's destructor.
Doc: Fixing typo
Diffstat (limited to 'src/gui/text/qtextlist.cpp')
| -rw-r--r-- | src/gui/text/qtextlist.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextlist.cpp b/src/gui/text/qtextlist.cpp index a0ff520..b66766e 100644 --- a/src/gui/text/qtextlist.cpp +++ b/src/gui/text/qtextlist.cpp @@ -235,7 +235,7 @@ QString QTextList::itemText(const QTextBlock &blockIt) const if (i % 4) { // c[i] == 4|5|9|40|50|90|400|500|900 if ((i-2) % 4) { - // c[i] == 4|9|40|90|400|900 => with substraction (IV, IX, XL, XC, ...) + // c[i] == 4|9|40|90|400|900 => with subtraction (IV, IX, XL, XC, ...) numDigits = 2; } else { |