diff options
Diffstat (limited to 'tests/auto/gui/text')
| -rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/gui/text/qtextformat/tst_qtextformat.cpp | 16 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 83d8d01062..5e4fdfcdc9 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -322,22 +322,22 @@ void tst_QFont::resetFont() QWidget secondChild(&parent); secondChild.setFont(childFont); - QVERIFY(parentFont.resolve() != 0); - QVERIFY(childFont.resolve() != 0); + QVERIFY(parentFont.resolveMask() != 0); + QVERIFY(childFont.resolveMask() != 0); QVERIFY(childFont != parentFont); // reset font on both children firstChild.setFont(QFont()); secondChild.setFont(QFont()); - QCOMPARE(firstChild.font().resolve(), QFont::SizeResolved); - QCOMPARE(secondChild.font().resolve(), QFont::SizeResolved); + QCOMPARE(firstChild.font().resolveMask(), QFont::SizeResolved); + QCOMPARE(secondChild.font().resolveMask(), QFont::SizeResolved); #ifdef Q_OS_ANDROID QEXPECT_FAIL("", "QTBUG-69214", Continue); #endif QCOMPARE(firstChild.font().pointSize(), parent.font().pointSize()); QCOMPARE(secondChild.font().pointSize(), parent.font().pointSize()); - QVERIFY(parent.font().resolve() != 0); + QVERIFY(parent.font().resolveMask() != 0); } #endif diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp index 7548dbb8e4..ef5e3a0e0b 100644 --- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp +++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp @@ -535,19 +535,19 @@ void tst_QTextFormat::setFont() QCOMPARE((int)f.font().capitalization(), (int)f.fontCapitalization()); QCOMPARE(f.font().kerning(), f.fontKerning()); - if (overrideAll || (font2.resolve() & QFont::StyleHintResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleHintResolved)) QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint()); else QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint()); - if (overrideAll || (font2.resolve() & QFont::StyleStrategyResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleStrategyResolved)) QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy()); else QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy()); - if (overrideAll || (font2.resolve() & QFont::CapitalizationResolved)) + if (overrideAll || (font2.resolveMask() & QFont::CapitalizationResolved)) QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization()); else QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization()); - if (overrideAll || (font2.resolve() & QFont::KerningResolved)) + if (overrideAll || (font2.resolveMask() & QFont::KerningResolved)) QCOMPARE(f.font().kerning(), font2.kerning()); else QCOMPARE(f.font().kerning(), font1.kerning()); @@ -639,19 +639,19 @@ void tst_QTextFormat::setFont_collection() int formatIndex = collection.indexForFormat(tmp); QTextCharFormat f = collection.charFormat(formatIndex); - if (overrideAll || (font2.resolve() & QFont::StyleHintResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleHintResolved)) QCOMPARE((int)f.font().styleHint(), (int)font2.styleHint()); else QCOMPARE((int)f.font().styleHint(), (int)font1.styleHint()); - if (overrideAll || (font2.resolve() & QFont::StyleStrategyResolved)) + if (overrideAll || (font2.resolveMask() & QFont::StyleStrategyResolved)) QCOMPARE((int)f.font().styleStrategy(), (int)font2.styleStrategy()); else QCOMPARE((int)f.font().styleStrategy(), (int)font1.styleStrategy()); - if (overrideAll || (font2.resolve() & QFont::CapitalizationResolved)) + if (overrideAll || (font2.resolveMask() & QFont::CapitalizationResolved)) QCOMPARE((int)f.font().capitalization(), (int)font2.capitalization()); else QCOMPARE((int)f.font().capitalization(), (int)font1.capitalization()); - if (overrideAll || (font2.resolve() & QFont::KerningResolved)) + if (overrideAll || (font2.resolveMask() & QFont::KerningResolved)) QCOMPARE(f.font().kerning(), font2.kerning()); else QCOMPARE(f.font().kerning(), font1.kerning()); |