summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/windows/qwindowsintegration.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.cpp')
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.cpp7
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 {