diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-11-26 21:26:29 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-11-27 07:28:24 +0000 |
| commit | c2dbc268937314e4a3825255a88a0e39bb8673a4 (patch) | |
| tree | 311b3a6682af04532442f339cdbe150f24ba848c /tests/auto/gui/text | |
| parent | 63c5d13885506c6133ca8d0e568e3aa54d85c84c (diff) | |
Fix compiler warnings from deprecated method
QTextCharFormat::fontFamily is deprecated in favor of fontFamilies,
which returns a QStringList wrapped in a QVariant, whereas the setter
expects a QStringList.
Change-Id: I3333eaae4fc5ec3e3bdbec58047d6b3554b4a171
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Diffstat (limited to 'tests/auto/gui/text')
| -rw-r--r-- | tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index a018279098..c308ce31b1 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -806,7 +806,7 @@ void tst_QTextDocument::toHtml_data() CREATE_DOC_AND_CURSOR(); QTextCharFormat fmt; - fmt.setFontFamily("Times"); + fmt.setFontFamilies({QLatin1String("Times")}); cursor.insertText("Blah", fmt); QTest::newRow("font-family") << QTextDocumentFragment(&doc) @@ -817,7 +817,7 @@ void tst_QTextDocument::toHtml_data() CREATE_DOC_AND_CURSOR(); QTextCharFormat fmt; - fmt.setFontFamily("Foo's Family"); + fmt.setFontFamilies({QLatin1String("Foo's Family")}); cursor.insertText("Blah", fmt); QTest::newRow("font-family-with-quotes1") << QTextDocumentFragment(&doc) @@ -828,7 +828,7 @@ void tst_QTextDocument::toHtml_data() CREATE_DOC_AND_CURSOR(); QTextCharFormat fmt; - fmt.setFontFamily("Foo\"s Family"); + fmt.setFontFamilies({QLatin1String("Foo\"s Family")}); cursor.insertText("Blah", fmt); QTest::newRow("font-family-with-quotes2") << QTextDocumentFragment(&doc) @@ -839,7 +839,6 @@ void tst_QTextDocument::toHtml_data() CREATE_DOC_AND_CURSOR(); QTextCharFormat fmt; - fmt.setFontFamily("Times"); fmt.setFontFamilies(QStringList{ "Times", "serif" }); cursor.insertText("Blah", fmt); @@ -3540,7 +3539,7 @@ void tst_QTextDocument::fontTagFace() td.setHtml("<html><body><font face='Times'>Foobar</font></body></html>"); QTextFragment fragment = td.begin().begin().fragment(); QTextCharFormat format = fragment.charFormat(); - QCOMPARE(format.fontFamily(), QLatin1String("Times")); + QCOMPARE(format.fontFamilies().toStringList().value(0, QString()), QLatin1String("Times")); } { @@ -3548,7 +3547,7 @@ void tst_QTextDocument::fontTagFace() td.setHtml("<html><body><font face='Times, serif'>Foobar</font></body></html>"); QTextFragment fragment = td.begin().begin().fragment(); QTextCharFormat format = fragment.charFormat(); - QCOMPARE(format.fontFamily(), QLatin1String("Times")); + QCOMPARE(format.fontFamilies().toStringList().value(0, QString()), QLatin1String("Times")); QStringList expectedFamilies = { QLatin1String("Times"), QLatin1String("serif") }; QCOMPARE(format.fontFamilies().toStringList(), expectedFamilies); } @@ -3563,7 +3562,7 @@ void tst_QTextDocument::mergeFontFamilies() "</body></html>")); QTextCharFormat newFormat; - newFormat.setFontFamily(QLatin1String("Jokerman")); + newFormat.setFontFamilies({QLatin1String("Jokerman")}); QTextCursor cursor = QTextCursor(&td); cursor.setPosition(0); |