diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-09-10 18:00:51 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-13 02:28:48 +0200 |
| commit | 741737b080cb50a99fd6c72be9128ffb41f6c66a (patch) | |
| tree | 3e0bad690470264311270356b3dbff442ee01f58 | |
| parent | 75d06db873296c465176a675a8353b7ed32139b1 (diff) | |
Implement QFontEngine::harfbuzzFont/Face() with HarfBuzz-NG
Change-Id: I5d4fed66d66e8aa650fe181e61dcc2345f0f907a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| -rw-r--r-- | src/gui/text/qfontengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 88a24b5e6a..297bc5129a 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -264,7 +264,7 @@ void *QFontEngine::harfbuzzFont() const { #ifdef QT_ENABLE_HARFBUZZ_NG if (useHarfbuzzNG) - qFatal("Called QFontEngine::harfbuzzFont() in Harfbuzz-NG mode!"); + return hb_qt_font_get_for_engine(const_cast<QFontEngine *>(this)); #endif if (!font_) { HB_FontRec *hbFont = (HB_FontRec *) malloc(sizeof(HB_FontRec)); @@ -292,7 +292,7 @@ void *QFontEngine::harfbuzzFace() const { #ifdef QT_ENABLE_HARFBUZZ_NG if (useHarfbuzzNG) - qFatal("Called QFontEngine::harfbuzzFace() in Harfbuzz-NG mode!"); + return hb_qt_face_get_for_engine(const_cast<QFontEngine *>(this)); #endif if (!face_) { HB_Face hbFace = qHBNewFace(const_cast<QFontEngine *>(this), hb_getSFntTable); |