1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Use native font engine by default.

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2012-03-27 17:05:53 +02:00 committed by Qt by Nokia
parent 95c71cef20
commit 76ae64abb5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,10 +283,11 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
{ {
if (!d->m_fontDatabase) { if (!d->m_fontDatabase) {
#ifndef QT_NO_FREETYPE #ifndef QT_NO_FREETYPE
if (d->m_nativeInterface.property("fontengine").toString() == QLatin1String("native")) const QVariant argument = d->m_nativeInterface.property("fontengine");
d->m_fontDatabase = new QWindowsFontDatabase(); if (argument.isValid() && argument.toString() == QLatin1String("freetype"))
else
d->m_fontDatabase = new QWindowsFontDatabaseFT(); d->m_fontDatabase = new QWindowsFontDatabaseFT();
else
d->m_fontDatabase = new QWindowsFontDatabase();
#else #else
d->m_fontDatabase = new QWindowsFontDatabase(); d->m_fontDatabase = new QWindowsFontDatabase();
#endif #endif