diff options
Diffstat (limited to 'src/gui/text/qfontdatabase.cpp')
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index a4e5130937..196eebb353 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -689,7 +689,6 @@ static void initFontDef(const QtFontDesc &desc, const QFontDef &request, QFontDe if (!multi) fontDef->style = desc.style->key.style; fontDef->fixedPitch = desc.family->fixedPitch; - fontDef->stretch = desc.style->key.stretch; fontDef->ignorePitch = false; } @@ -1010,7 +1009,7 @@ QFontEngine *loadEngine(int script, const QFontDef &request, QFontEngine *engine = loadSingleEngine(script, request, family, foundry, style, size); if (engine && !(request.styleStrategy & QFont::NoFontMerging) && !engine->symbol) { - Q_TRACE(qfontdatabase_loadengine, request.family, request.pointSize); + Q_TRACE(QFontDatabase_loadEngine, request.family, request.pointSize); QPlatformFontDatabase *pfdb = QGuiApplicationPrivate::platformIntegration()->fontDatabase(); QFontEngineMulti *pfMultiEngine = pfdb->fontEngineMulti(engine, QChar::Script(script)); @@ -2442,7 +2441,7 @@ int QFontDatabasePrivate::addAppFont(const QByteArray &fontData, const QString & font.data = fontData; font.fileName = fileName; - Q_TRACE(qfontdatabaseprivate_addappfont, fileName); + Q_TRACE(QFontDatabasePrivate_addAppFont, fileName); int i; for (i = 0; i < applicationFonts.count(); ++i) @@ -2500,7 +2499,7 @@ int QFontDatabase::addApplicationFont(const QString &fileName) if (!f.open(QIODevice::ReadOnly)) return -1; - Q_TRACE(qfontdatabase_addapplicationfont, fileName); + Q_TRACE(QFontDatabase_addApplicationFont, fileName); data = f.readAll(); } @@ -2800,7 +2799,7 @@ void QFontDatabase::load(const QFontPrivate *d, int script) QFontEngine *fe = nullptr; - Q_TRACE(qfontdatabase_load, req.family, req.pointSize); + Q_TRACE(QFontDatabase_load, req.family, req.pointSize); req.fallBackFamilies = fallBackFamilies; if (!req.fallBackFamilies.isEmpty()) |