diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-27 01:00:36 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-27 01:00:36 +0100 |
| commit | ec5e692c1c4d8576d19723bb1193703275efdc90 (patch) | |
| tree | 976b6844203d60d4bf0b4c65dcfaf8eba7621506 /src/gui | |
| parent | f91d1e08099e67c77c8d7bcda362f07eec054ae8 (diff) | |
| parent | ba13c6c08f30a4c2f188f69deeaf4ca6a020d7a1 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I04afffdce6b78856d0301eb583f21d334c7466b0
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.pri | 2 | ||||
| -rw-r--r-- | src/gui/text/qharfbuzzng.cpp | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/configure.pri b/src/gui/configure.pri index 2971fd136e..e21489ec28 100644 --- a/src/gui/configure.pri +++ b/src/gui/configure.pri @@ -55,7 +55,7 @@ defineTest(qtConfTest_qpaDefaultPlatform) { else: qnx: name = qnx else: integrity: name = integrityfb else: haiku: name = haiku - else: wasm: name = webassembly + else: wasm: name = wasm else: name = xcb $${1}.value = $$name diff --git a/src/gui/text/qharfbuzzng.cpp b/src/gui/text/qharfbuzzng.cpp index 36bd81c76b..21f880e7be 100644 --- a/src/gui/text/qharfbuzzng.cpp +++ b/src/gui/text/qharfbuzzng.cpp @@ -686,11 +686,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); -#ifdef Q_OS_MAC - hb_font_set_scale(font, QFixed(x_ppem).value(), QFixed(y_ppem).value()); -#else hb_font_set_scale(font, QFixed(x_ppem).value(), -QFixed(y_ppem).value()); -#endif hb_font_set_ppem(font, x_ppem, y_ppem); return font; |