1 files changed, 7 insertions, 11 deletions
diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp
index d2e7df9c10..010f955c60 100644
--- a/src/gui/text/qharfbuzzng.cpp
+++ b/src/gui/text/qharfbuzzng.cpp
@@ -439,18 +439,16 @@ _hb_qt_font_get_glyph_h_advance(hb_font_t *font, void *font_data,
     QFontEngine *fe = (QFontEngine *)font_data;
     Q_ASSERT(fe);
 
-    QFixed advance_x;
-    QFixed advance_y;
+    QFixed advance;
 
     QGlyphLayout g;
     g.numGlyphs = 1;
     g.glyphs = &glyph;
-    g.advances_x = &advance_x;
-    g.advances_y = &advance_y;
+    g.advances = &advance;
 
     fe->recalcAdvances(&g, QFontEngine::ShaperFlags(hb_qt_font_get_use_design_metrics(font)));
 
-    return g.advances_x[0].value();
+    return g.advances[0].value();
 }
 
 static hb_position_t
@@ -490,18 +488,16 @@ _hb_qt_font_get_glyph_h_kerning(hb_font_t *font, void *font_data,
     Q_ASSERT(fe);
 
     glyph_t glyphs[2] = { first_glyph, second_glyph };
-    QFixed advance_x;
-    QFixed advance_y;
+    QFixed advance;
 
     QGlyphLayout g;
     g.numGlyphs = 2;
     g.glyphs = glyphs;
-    g.advances_x = &advance_x;
-    g.advances_y = &advance_y;
+    g.advances = &advance;
 
     fe->doKerning(&g, QFontEngine::ShaperFlags(hb_qt_font_get_use_design_metrics(font)));
 
-    return g.advances_x[0].value();
+    return g.advances[0].value();
 }
 
 static hb_position_t
@@ -710,7 +706,7 @@ _hb_qt_font_create(QFontEngine *fe)
     const int x_ppem = (fe->fontDef.pixelSize * fe->fontDef.stretch) / 100;
 
     hb_font_set_funcs(font, hb_qt_get_font_funcs(), (void *)fe, NULL);
-    hb_font_set_scale(font, QFixed(x_ppem).value(), -QFixed(y_ppem).value());
+    hb_font_set_scale(font, QFixed(x_ppem).value(), QFixed(y_ppem).value());
     hb_font_set_ppem(font, x_ppem, y_ppem);
 
     return font;