diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:25 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-09 01:00:26 +0100 |
| commit | 6074ebf728668288e082cf7dca15de215cc0f653 (patch) | |
| tree | ddc25bb3fa460618353e873a8ac03db30f4950e2 /tests | |
| parent | 84bf4d90b7154940486d3c3969a81c259496e830 (diff) | |
| parent | 5e66ea373a581d7e62b829d0ffa7f84d754c7f8f (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I7be168303fc4fec5892f20f8dcbdf1bdfcd4986f
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 13 | ||||
| -rw-r--r-- | tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/fromiccprofile.pro (renamed from tests/libfuzzer/gui/iccparser/iccparser.pro) | 0 | ||||
| -rw-r--r-- | tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/main.cpp (renamed from tests/libfuzzer/gui/iccparser/main.cpp) | 0 |
3 files changed, 12 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index 6eae6db12a..10a627bb82 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -3603,7 +3603,18 @@ void tst_QTextDocument::mergeFontFamilies() cursor.setPosition(QByteArray("Hello World").length(), QTextCursor::KeepAnchor); cursor.mergeCharFormat(newFormat); - QVERIFY(td.toHtml().contains(QLatin1String("font-family:'Jokerman','MS Shell Dlg 2';"))); + QVERIFY(td.toHtml().contains(QLatin1String("font-family:'MS Shell Dlg 2','Jokerman';"))); + + QTextCharFormat newFormatFamilies; + newFormatFamilies.setFontFamilies({ QLatin1String("Arial"), QLatin1String("Helvetica") }); + cursor.mergeCharFormat(newFormatFamilies); + + QVERIFY(td.toHtml().contains(QLatin1String("font-family:'Arial','Helvetica','Jokerman'"))); + + newFormatFamilies.setFontFamilies({ QLatin1String("Arial"), QLatin1String("Jokerman"), QLatin1String("Helvetica") }); + cursor.mergeCharFormat(newFormatFamilies); + + QVERIFY(td.toHtml().contains(QLatin1String("font-family:'Arial','Jokerman','Helvetica'"))); } void tst_QTextDocument::clearUndoRedoStacks() diff --git a/tests/libfuzzer/gui/iccparser/iccparser.pro b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/fromiccprofile.pro index 934ff81077..934ff81077 100644 --- a/tests/libfuzzer/gui/iccparser/iccparser.pro +++ b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/fromiccprofile.pro diff --git a/tests/libfuzzer/gui/iccparser/main.cpp b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/main.cpp index 7681c1468e..7681c1468e 100644 --- a/tests/libfuzzer/gui/iccparser/main.cpp +++ b/tests/libfuzzer/gui/painting/qcolorspace/fromiccprofile/main.cpp |