1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
index ee58a19ca9..47d6a2f11a 100644
--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
+++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
@@ -283,10 +283,11 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
 {
     if (!d->m_fontDatabase) {
 #ifndef QT_NO_FREETYPE
-        if (d->m_nativeInterface.property("fontengine").toString() == QLatin1String("native"))
-            d->m_fontDatabase = new QWindowsFontDatabase();
-        else
+        const QVariant argument = d->m_nativeInterface.property("fontengine");
+        if (argument.isValid() && argument.toString() == QLatin1String("freetype"))
             d->m_fontDatabase = new QWindowsFontDatabaseFT();
+        else
+            d->m_fontDatabase = new QWindowsFontDatabase();
 #else
         d->m_fontDatabase = new QWindowsFontDatabase();
 #endif
@@ -317,6 +318,8 @@ QVariant QWindowsIntegration::styleHint(QPlatformIntegration::StyleHint hint) co
     case QPlatformIntegration::KeyboardInputInterval:
     case QPlatformIntegration::ShowIsFullScreen:
         break; // Not implemented
+    case QPlatformIntegration::FontSmoothingGamma:
+        return QVariant(QWindowsFontDatabase::fontSmoothingGamma());
     }
     return QPlatformIntegration::styleHint(hint);
 }