From 741737b080cb50a99fd6c72be9128ffb41f6c66a Mon Sep 17 00:00:00 2001
From: Konstantin Ritt <ritt.ks@gmail.com>
Date: Tue, 10 Sep 2013 18:00:51 +0300
Subject: [PATCH] Implement QFontEngine::harfbuzzFont/Face() with HarfBuzz-NG

Change-Id: I5d4fed66d66e8aa650fe181e61dcc2345f0f907a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/gui/text/qfontengine.cpp | 4 ++--
 1 file 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);