Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Qt 5.11 compatibility

Browse Source
This commit is contained in:
Kovid Goyal 2018-05-22 19:40:13 +05:30
parent 029ad0d0d5
commit 68bbec179a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/headless/fontconfig_database.cpp
View File

@ -284,7 +284,21 @@ static const char specialLanguages[][6] = {
"", // Hatran "", // Hatran
"", // Multani "", // Multani
"", // OldHungarian "", // OldHungarian
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
"", // SignWriting
"", // Adlam
"", // Bhaiksuki
"", // Marchen
"", // Newa
"", // Osage
"", // Tangut
"", // MasaramGondi
"", // Nushu
"", // Soyombo
"" // ZanabazarSquare
#else
"" // SignWriting "" // SignWriting
#endif // Qt >= 5.11
#else #else
"hoc" // WarangCiti "hoc" // WarangCiti
#endif // Qt >= 5.6.0 #endif // Qt >= 5.6.0
@ -541,7 +555,7 @@ static void populateFromPattern(FcPattern *pattern)
QPlatformFontDatabase::registerFont(familyName,styleName,QLatin1String((const char *)foundry_value),weight,style,stretch,antialias,scalable,pixel_size,fixedPitch,writingSystems,fontFile); QPlatformFontDatabase::registerFont(familyName,styleName,QLatin1String((const char *)foundry_value),weight,style,stretch,antialias,scalable,pixel_size,fixedPitch,writingSystems,fontFile);
// qDebug() << familyName << (const char *)foundry_value << weight << style << &writingSystems << scalable << true << pixel_size; // qDebug() << familyName << (const char *)foundry_value << weight << style << &writingSystems << scalable << true << pixel_size;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
for (int k = 1; FcPatternGetString(pattern, FC_FAMILY, k, &value) == FcResultMatch; ++k) { for (int k = 1; FcPatternGetString(pattern, FC_FAMILY, k, &value) == FcResultMatch; ++k) {
const QString altFamilyName = QString::fromUtf8((const char *)value); const QString altFamilyName = QString::fromUtf8((const char *)value);
// Extra family names can be aliases or subfamilies. // Extra family names can be aliases or subfamilies.
@ -674,7 +688,7 @@ QFontEngine::HintStyle defaultHintStyleFromMatch(QFont::HintingPreference hintin
} }
// Removed by Kovid for headless QPA // Removed by Kovid for headless QPA
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
if (QHighDpiScaling::isActive()) if (QHighDpiScaling::isActive())
return QFontEngine::HintNone; return QFontEngine::HintNone;