Windows: Use native font engine by default.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Tue, 27 Mar 2012 15:05:53 +0000 (17:05 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 5 Apr 2012 10:46:31 +0000 (12:46 +0200)
Turn around the meaning of the command line parameter.
The FreeType engine can now be activated by passing freetype.

Change-Id: I9da6cd4a127603f9cfb91f0ce8450088c0883faa
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/plugins/platforms/windows/qwindowsintegration.cpp

index fa63d77..47d6a2f 100644 (file)
@@ -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