diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-04-20 11:57:17 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 16:21:31 +0200 |
| commit | a941e0c0a63697419c224c71ae8eaa808cecaaf9 (patch) | |
| tree | edf23930cd37daee3b997048894930f85f910cf0 /src/plugins/platforms/windows/qwindowsintegration.cpp | |
| parent | 9b7739899e5040cb6fbb4825a6ac96d9eaca60d6 (diff) | |
Windows: Remove fontengine autodetection logic
Always default to native font engine as native fonts now work in
QML applications, too.
Change-Id: Iafa5f6d25a9a3b22f49763f287e4e358216cfc2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index f014a956f8..45f6ecf652 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -285,7 +285,6 @@ QPlatformOpenGLContext * QML2 applications. */ enum FontDatabaseOption { - FontDatabaseAuto, FontDatabaseFreeType, FontDatabaseNative }; @@ -300,7 +299,7 @@ static inline FontDatabaseOption fontDatabaseOption(const QObject &nativeInterfa if (argument == QLatin1String("native")) return FontDatabaseNative; } - return FontDatabaseAuto; + return FontDatabaseNative; } QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const @@ -310,10 +309,6 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const d->m_fontDatabase = new QWindowsFontDatabase(); #else FontDatabaseOption option = fontDatabaseOption(d->m_nativeInterface); - if (option == FontDatabaseAuto) { - option = QCoreApplication::applicationName() == QStringLiteral("QtQmlViewer") ? - FontDatabaseFreeType : FontDatabaseNative; - } if (option == FontDatabaseFreeType) { d->m_fontDatabase = new QWindowsFontDatabaseFT; } else { |