maint: Merge stable to default.

gnu-octave · Oct 10, 2024 · 6562f09 · 6562f09
2 parents bdbc39f + 11cfa3b
commit 6562f09
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/octave-svgconvert.cc b/src/octave-svgconvert.cc
@@ -373,8 +373,7 @@ draw (QDomElement& parent_elt, pdfpainter& painter)
           if (! str.isEmpty ())
             {
               // Font
-              font = QFont ();
-              font.setFamily (elt.attribute ("font-family"));
+              font = QFont (str);
 
               str = elt.attribute ("font-weight");
               if (! str.isEmpty () && str != "normal")
@@ -535,7 +534,14 @@ draw (QDomElement& parent_elt, pdfpainter& painter)
 
           QString str = elt.attribute ("font-family");
           if (! str.isEmpty ())
-            font.setFamily (elt.attribute ("font-family"));
+            {
+              // QFont::setFamily() doesn't seem to work properly in Qt6
+              // (see bug #66306). Use the QFont constructor to update
+              // the current font.
+              font = QFont (str, -1, font.weight (),
+                            font.style () ==  QFont::StyleItalic);
+              font.setPixelSize (saved_font.pixelSize ());
+            }
 
           str = elt.attribute ("font-weight");
           if (! str.isEmpty ())