diff options
Diffstat (limited to 'src/platformsupport')
-rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp | 6 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp index 956cf68290..b0460814ca 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig.cpp @@ -38,7 +38,7 @@ QT_BEGIN_NAMESPACE QFontEngineMultiFontConfig::QFontEngineMultiFontConfig(QFontEngine *fe, int script) - : QFontEngineMultiBasicImpl(fe, script) + : QFontEngineMulti(fe, script) { } @@ -67,8 +67,8 @@ bool QFontEngineMultiFontConfig::shouldLoadFontEngineForCharacter(int at, uint u FcPattern * QFontEngineMultiFontConfig::getMatchPatternForFallback(int fallBackIndex) const { Q_ASSERT(fallBackIndex < fallbackFamilyCount()); - if (engines.size() - 1 > cachedMatchPatterns.size()) - cachedMatchPatterns.resize(engines.size() - 1); + if (fallbackFamilyCount() > cachedMatchPatterns.size()) + cachedMatchPatterns.resize(fallbackFamilyCount()); FcPattern *ret = cachedMatchPatterns.at(fallBackIndex); if (ret) return ret; diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h index 115f8e6c16..8ebdccd294 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h +++ b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -class QFontEngineMultiFontConfig : public QFontEngineMultiBasicImpl +class QFontEngineMultiFontConfig : public QFontEngineMulti { public: explicit QFontEngineMultiFontConfig(QFontEngine *fe, int script); |