AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows: Remove fontengine autodetection logic

Browse Source 
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>
This commit is contained in:
Miikka Heikkinen 2012-04-20 11:57:17 +03:00 committed by Qt by Nokia
parent 9b7739899e
commit a941e0c0a6
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/main.cpp
View File

@ -59,8 +59,8 @@ QT_BEGIN_NAMESPACE
of QGuiApplication:
\list
\li \c fontengine=native Indicates that the freetype font
engine should not be used.
\li \c fontengine=native Indicates that native font engine should be used (default)
\li \c fontengine=freetype Indicates that freetype font engine should be used
\li \c gl=gdi Indicates that ARB Open GL functionality should not be used
\endlist

7
src/plugins/platforms/windows/qwindowsintegration.cpp
View File

@ -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 {