1 files changed, 40 insertions, 0 deletions
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
index 03e72546eb..98bf91fa9d 100644
--- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
+++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
@@ -44,6 +44,9 @@
 #include "qfontengine_ft_p.h"
 #include "private/qimage_p.h"
 #include <private/qstringiterator_p.h>
+#include <qguiapplication.h>
+#include <qscreen.h>
+#include <qpa/qplatformscreen.h>
 
 #ifndef QT_NO_FREETYPE
 
@@ -666,6 +669,43 @@ static void convoluteBitmap(const uchar *src, uchar *dst, int width, int height,
     }
 }
 
+static QFontEngine::SubpixelAntialiasingType subpixelAntialiasingTypeHint()
+{
+    static int type = -1;
+    if (type == -1) {
+        if (QScreen *screen = QGuiApplication::primaryScreen())
+            type = screen->handle()->subpixelAntialiasingTypeHint();
+    }
+    return static_cast<QFontEngine::SubpixelAntialiasingType>(type);
+}
+
+QFontEngineFT *QFontEngineFT::create(const QFontDef &fontDef, FaceId faceId, const QByteArray &fontData)
+{
+    QScopedPointer<QFontEngineFT> engine(new QFontEngineFT(fontDef));
+
+    QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_Mono;
+    const bool antialias = !(fontDef.styleStrategy & QFont::NoAntialias);
+
+    if (antialias) {
+        QFontEngine::SubpixelAntialiasingType subpixelType = subpixelAntialiasingTypeHint();
+        if (subpixelType == QFontEngine::Subpixel_None || (fontDef.styleStrategy & QFont::NoSubpixelAntialias)) {
+            format = QFontEngineFT::Format_A8;
+            engine->subpixelType = QFontEngine::Subpixel_None;
+        } else {
+            format = QFontEngineFT::Format_A32;
+            engine->subpixelType = subpixelType;
+        }
+    }
+
+    if (!engine->init(faceId, antialias, format, fontData) || engine->invalid()) {
+        qWarning("QFontEngineFT: Failed to create FreeType font engine");
+        return nullptr;
+    }
+
+    engine->setQtDefaultHintStyle(static_cast<QFont::HintingPreference>(fontDef.hintingPreference));
+    return engine.take();
+}
+
 QFontEngineFT::QFontEngineFT(const QFontDef &fd)
     : QFontEngine(Freetype)
 {