diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qtextformat/tst_qtextformat.cpp | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp index 84539b86cc..4e005e7f1e 100644 --- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp +++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp @@ -285,22 +285,26 @@ void tst_QTextFormat::testLetterSpacing() QTextCharFormat format; QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), false); - QCOMPARE(format.hasProperty(QTextFormat::FontAbsoluteLetterSpacing), false); + QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacingType), false); - format.setFontAbsoluteLetterSpacing(10.0); + format.setFontLetterSpacingType(QFont::AbsoluteSpacing); + format.setFontLetterSpacing(10.0); - QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), false); - QCOMPARE(format.property(QTextFormat::FontAbsoluteLetterSpacing).toDouble(), 10.0); + QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), true); + QCOMPARE(format.property(QTextFormat::FontLetterSpacing).toDouble(), 10.0); + QCOMPARE(format.property(QTextFormat::FontLetterSpacingType).toInt(), int(QFont::AbsoluteSpacing)); + format.setFontLetterSpacingType(QFont::PercentageSpacing); format.setFontLetterSpacing(110.0); QCOMPARE(format.property(QTextFormat::FontLetterSpacing).toDouble(), 110.0); - QCOMPARE(format.hasProperty(QTextFormat::FontAbsoluteLetterSpacing), false); + QCOMPARE(format.property(QTextFormat::FontLetterSpacingType).toInt(), int(QFont::PercentageSpacing)); - format.setFontAbsoluteLetterSpacing(10.0); + format.setFontLetterSpacingType(QFont::AbsoluteSpacing); + format.setFontLetterSpacing(10.0); - QCOMPARE(format.hasProperty(QTextFormat::FontLetterSpacing), false); - QCOMPARE(format.property(QTextFormat::FontAbsoluteLetterSpacing).toDouble(), 10.0); + QCOMPARE(format.property(QTextFormat::FontLetterSpacingType).toInt(), int(QFont::AbsoluteSpacing)); + QCOMPARE(format.property(QTextFormat::FontLetterSpacing).toDouble(), 10.0); } void tst_QTextFormat::testFontStretch() |