Use OpenType font weights

Task-number: QTBUG-42248
Change-Id: Icdb301b27d6699c2b842c4563fbef9df73c23cbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

9 files changed, 44 insertions, 45 deletions

diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
index 4983db579a..382f17d519 100644
--- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp
@@ -334,7 +334,7 @@ void tst_QGuiVariant::toFont_data()
     QTest::addColumn<QFont>("result");
 
     QFont f("times",12,-1,false);
-    QTest::newRow( "string" ) << QVariant( QString( "times,12,-1,5,50,0,0,0,0,0" ) ) << f;
+    QTest::newRow( "string" ) << QVariant( QString( "times,12,-1,5,400,0,0,0,0,0" ) ) << f;
 }
 
 void tst_QGuiVariant::toFont()
@@ -384,7 +384,7 @@ void tst_QGuiVariant::toString_data()
 #endif
 
     QFont font( "times", 12 );
-    QTest::newRow("qfont") << QVariant::fromValue(font) << QString("times,12,-1,5,50,0,0,0,0,0,0,0,0,0,0,1");
+    QTest::newRow("qfont") << QVariant::fromValue(font) << QString("times,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1");
     QTest::newRow( "qcolor" ) << QVariant::fromValue( QColor( 10, 10, 10 ) ) << QString( "#0a0a0a" );
 }
 
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);
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index 4e51ccea43..04f8a9aa38 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -285,11 +285,10 @@ void tst_QTextDocument::init()
             "p, li { white-space: pre-wrap; }\n"
             "</style></head>"
             "<body style=\" font-family:'%1'; font-size:%2; font-weight:%3; font-style:%4;\">\n");
-    htmlHead = htmlHead
-                .arg(defaultFont.family())
-                .arg(cssFontSizeString(defaultFont))
-                .arg(defaultFont.weight() * 8)
-                .arg((defaultFont.italic() ? "italic" : "normal"));
+    htmlHead = htmlHead.arg(defaultFont.family())
+                       .arg(cssFontSizeString(defaultFont))
+                       .arg(defaultFont.weight())
+                       .arg((defaultFont.italic() ? "italic" : "normal"));
 
     htmlTail = QString("</body></html>");
 }
@@ -999,7 +998,7 @@ void tst_QTextDocument::toHtml_data()
         CREATE_DOC_AND_CURSOR();
 
         QTextCharFormat fmt;
-        fmt.setFontWeight(40);
+        fmt.setFontWeight(320);
         cursor.insertText("Blah", fmt);
 
         QTest::newRow("font-weight") << QTextDocumentFragment(&doc)
@@ -1854,11 +1853,10 @@ void tst_QTextDocument::toHtmlBodyBgColor()
             "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Blah</p>"
             "</body></html>");
 
-    expectedHtml = expectedHtml
-                    .arg(defaultFont.family())
-                    .arg(cssFontSizeString(defaultFont))
-                    .arg(defaultFont.weight() * 8)
-                    .arg((defaultFont.italic() ? "italic" : "normal"));
+    expectedHtml = expectedHtml.arg(defaultFont.family())
+                           .arg(cssFontSizeString(defaultFont))
+                           .arg(defaultFont.weight())
+                           .arg((defaultFont.italic() ? "italic" : "normal"));
 
     QCOMPARE(doc.toHtml(), expectedHtml);
 }
@@ -1884,9 +1882,9 @@ void tst_QTextDocument::toHtmlBodyBgColorRgba()
             "</body></html>");
 
     expectedHtml = expectedHtml.arg(defaultFont.family())
-                    .arg(cssFontSizeString(defaultFont))
-                    .arg(defaultFont.weight() * 8)
-                    .arg((defaultFont.italic() ? "italic" : "normal"));
+                           .arg(cssFontSizeString(defaultFont))
+                           .arg(defaultFont.weight())
+                           .arg((defaultFont.italic() ? "italic" : "normal"));
 
     QCOMPARE(doc.toHtml(), expectedHtml);
 }
@@ -1911,11 +1909,10 @@ void tst_QTextDocument::toHtmlBodyBgColorTransparent()
             "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Blah</p>"
             "</body></html>");
 
-    expectedHtml = expectedHtml
-                    .arg(defaultFont.family())
-                    .arg(cssFontSizeString(defaultFont))
-                    .arg(defaultFont.weight() * 8)
-                    .arg((defaultFont.italic() ? "italic" : "normal"));
+    expectedHtml = expectedHtml.arg(defaultFont.family())
+                           .arg(cssFontSizeString(defaultFont))
+                           .arg(defaultFont.weight())
+                           .arg((defaultFont.italic() ? "italic" : "normal"));
 
     QCOMPARE(doc.toHtml(), expectedHtml);
 }
@@ -1989,7 +1986,7 @@ void tst_QTextDocument::toHtmlDefaultFontSpacingProperties()
                                      "</body></html>");
     expectedOutput = expectedOutput.arg(defaultFont.family())
                                    .arg(cssFontSizeString(defaultFont))
-                                   .arg(defaultFont.weight() * 8)
+                                   .arg(defaultFont.weight())
                                    .arg((defaultFont.italic() ? "italic" : "normal"));
 
     QCOMPARE(doc.toHtml(), expectedOutput);
@@ -2615,10 +2612,11 @@ void tst_QTextDocument::html_defaultFont()
     doc->setDefaultFont(f);
     doc->setPlainText("Test");
 
-    QString bodyPart = QString::fromLatin1("<body style=\" font-family:'%1'; font-size:%2; font-weight:%3; font-style:italic;\">")
-                       .arg(f.family())
-                       .arg(cssFontSizeString(f))
-                       .arg(f.weight() * 8);
+    QString bodyPart = QString::fromLatin1("<body style=\" font-family:'%1'; font-size:%2; "
+                                           "font-weight:%3; font-style:italic;\">")
+                               .arg(f.family())
+                               .arg(cssFontSizeString(f))
+                               .arg(f.weight());
 
     QString html = doc->toHtml();
     if (!html.contains(bodyPart)) {
@@ -2760,11 +2758,10 @@ void tst_QTextDocument::backgroundImage_checkExpectedHtml(const QTextDocument &d
             "\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Blah</p>"
             "</td></tr></table></body></html>");
 
-    expectedHtml = expectedHtml
-                    .arg(defaultFont.family())
-                    .arg(cssFontSizeString(defaultFont))
-                    .arg(defaultFont.weight() * 8)
-                    .arg((defaultFont.italic() ? "italic" : "normal"));
+    expectedHtml = expectedHtml.arg(defaultFont.family())
+                           .arg(cssFontSizeString(defaultFont))
+                           .arg(defaultFont.weight())
+                           .arg((defaultFont.italic() ? "italic" : "normal"));
 
     writeActualAndExpected(QTest::currentTestFunction(), doc.toHtml(), expectedHtml);
 
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 3b4c55d406..159effbd8f 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -2427,7 +2427,7 @@ void tst_QTextDocumentFragment::defaultFont()
     doc->setDefaultFont(f);
     doc->setPlainText("Hello World");
     const QString html = doc->toHtml();
-    QLatin1String str("<body style=\" font-family:'Courier New'; font-size:100pt; font-weight:600; font-style:italic;\">");
+    QLatin1String str("<body style=\" font-family:'Courier New'; font-size:100pt; font-weight:700; font-style:italic;\">");
     QVERIFY(html.contains(str));
 }
 
@@ -2756,7 +2756,7 @@ void tst_QTextDocumentFragment::css_fontWeight()
 {
     setHtml("<p style=\"font-weight:bold\">blah</p>");
     QCOMPARE(doc->begin().charFormat().fontWeight(), int(QFont::Bold));
-    setHtml("<p style=\"font-weight:600\">blah</p>");
+    setHtml("<p style=\"font-weight:700\">blah</p>");
     QCOMPARE(doc->begin().charFormat().fontWeight(), int(QFont::Bold));
 
 }
diff --git a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
index 474b2def60..bc9dc1b695 100644
--- a/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
+++ b/tests/auto/gui/text/qtextmarkdownimporter/tst_qtextmarkdownimporter.cpp
@@ -326,7 +326,7 @@ void tst_QTextMarkdownImporter::nestedSpans()
                          << "monospace" << QFontInfo(fmt.font()).fixedPitch() // depends on installed fonts (QTBUG-75649)
                                         << fmt.fontFixedPitch() // returns false even when font family is "monospace"
                                         << fmt.hasProperty(QTextFormat::FontFixedPitch); // works
-        QCOMPARE(fmt.fontWeight() > 50, expectedFormat.testFlag(Bold));
+        QCOMPARE(fmt.fontWeight() > QFont::Normal, expectedFormat.testFlag(Bold));
         QCOMPARE(fmt.fontItalic(), expectedFormat.testFlag(Italic));
         QCOMPARE(fmt.fontStrikeOut(), expectedFormat.testFlag(Strikeout));
         QCOMPARE(fmt.isAnchor(), expectedFormat.testFlag(Link));
diff --git a/tests/auto/other/lancelot/scripts/gradientxform_device.qps b/tests/auto/other/lancelot/scripts/gradientxform_device.qps
index 82ebb536bb..cd8b55d5b6 100644
--- a/tests/auto/other/lancelot/scripts/gradientxform_device.qps
+++ b/tests/auto/other/lancelot/scripts/gradientxform_device.qps
@@ -24,7 +24,7 @@ setPen brush 30
 setBrush lightblue
 drawRect 175 15 70 70
 
-setFont "times" 110 99
+setFont "times" 110 1000
 drawText 270 100 "X"
 
 restore
diff --git a/tests/auto/other/lancelot/scripts/gradientxform_logical.qps b/tests/auto/other/lancelot/scripts/gradientxform_logical.qps
index 1bb157b635..1bba63a929 100644
--- a/tests/auto/other/lancelot/scripts/gradientxform_logical.qps
+++ b/tests/auto/other/lancelot/scripts/gradientxform_logical.qps
@@ -24,7 +24,7 @@ setPen brush 30
 setBrush lightblue
 drawRect 175 15 70 70
 
-setFont "times" 110 99
+setFont "times" 110 1000
 drawText 270 100 "X"
 
 restore
diff --git a/tests/auto/other/lancelot/scripts/gradientxform_object.qps b/tests/auto/other/lancelot/scripts/gradientxform_object.qps
index dcc718072f..e34da24d46 100644
--- a/tests/auto/other/lancelot/scripts/gradientxform_object.qps
+++ b/tests/auto/other/lancelot/scripts/gradientxform_object.qps
@@ -26,7 +26,7 @@ translate 110 0
 drawRect 65 15 70 70
 
 translate 110 0
-setFont "times" 110 99
+setFont "times" 110 1000
 drawText 50 100 "X"
 
 restore
diff --git a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
index 1d475005bf..3ff68e25e3 100644
--- a/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
+++ b/tests/auto/tools/uic/baseline/authenticationdialog.ui.h
@@ -84,7 +84,7 @@ public:
         siteDescription->setObjectName(QString::fromUtf8("siteDescription"));
         QFont font;
         font.setBold(true);
-        font.setWeight(75);
+        font.setWeight(QFont::Weight(700));
         siteDescription->setFont(font);
         siteDescription->setWordWrap(true);