diff options
Diffstat (limited to 'tests/auto/gui/text/qfont/tst_qfont.cpp')
-rw-r--r-- | tests/auto/gui/text/qfont/tst_qfont.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp index 5e4fdfcdc9..93fcd71bb6 100644 --- a/tests/auto/gui/text/qfont/tst_qfont.cpp +++ b/tests/auto/gui/text/qfont/tst_qfont.cpp @@ -425,7 +425,7 @@ void tst_QFont::serialize_data() QTest::newRow("stretch") << font << QDataStream::Qt_4_3; font = basicFont; - font.setWeight(99); + font.setWeight(QFont::Light); QTest::newRow("weight") << font << QDataStream::Qt_1_0; font = basicFont; @@ -591,7 +591,7 @@ void tst_QFont::toAndFromString() // Since Qt 6.0 it was changed to include more information in the description, so // this checks for compatibility - const QString fontStringFrom515(QLatin1String("Times New Roman,18,-1,5,75,1,0,0,1,0,Regular")); + const QString fontStringFrom515(QLatin1String("Times New Roman,18,-1,5,700,1,0,0,1,0,Regular")); QFont fontFrom515("Times New Roman", 18); fontFrom515.setBold(true); fontFrom515.setItalic(true); @@ -601,7 +601,8 @@ void tst_QFont::toAndFromString() from515String.fromString(fontStringFrom515); QCOMPARE(from515String, fontFrom515); - const QString fontStringFrom60(QLatin1String("Times New Roman,18,-1,5,75,1,0,0,1,0,1,0,150.5,2.5,50,2,Regular")); + const QString fontStringFrom60( + QLatin1String("Times New Roman,18,-1,5,700,1,0,0,1,0,1,0,150.5,2.5,50,2,Regular")); QFont fontFrom60 = fontFrom515; fontFrom60.setStyleStrategy(QFont::PreferBitmap); fontFrom60.setCapitalization(QFont::AllUppercase); @@ -617,17 +618,18 @@ void tst_QFont::toAndFromString() void tst_QFont::fromStringWithoutStyleName() { QFont font1; - font1.fromString("Noto Sans,12,-1,5,50,0,0,0,0,0,Regular"); + font1.fromString("Noto Sans,12,-1,5,400,0,0,0,0,0,Regular"); QFont font2 = font1; - const QString str = "Times,16,-1,5,50,0,0,0,0,0,0,0,0,0,0,1"; + const QString str = "Times,16,-1,5,400,0,0,0,0,0,0,0,0,0,0,1"; font2.fromString(str); QCOMPARE(font2.toString(), str); - const QString fontStringFrom60(QLatin1String("Times New Roman,18,-1,5,75,1,0,0,1,0,1,0,150.5,2.5,50,2")); + const QString fontStringFrom60( + QLatin1String("Times New Roman,18,-1,5,700,1,0,0,1,0,1,0,150.5,2.5,50,2")); QFont font3; - font3.fromString("Noto Sans,12,-1,5,50,0,0,0,0,0,Regular"); + font3.fromString("Noto Sans,12,-1,5,400,0,0,0,0,0,Regular"); QFont font4 = font3; font4.fromString(fontStringFrom60); QCOMPARE(font4.toString(), fontStringFrom60); |