From 68bbec179abc980ebcb3f13854d2e4fd46f4897c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 22 May 2018 19:40:13 +0530
Subject: [PATCH] Qt 5.11 compatibility

---
 src/calibre/headless/fontconfig_database.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
index 6bda40c5736c..d867f02948d8 100644
--- a/src/calibre/headless/fontconfig_database.cpp
+++ b/src/calibre/headless/fontconfig_database.cpp
@@ -284,7 +284,21 @@ static const char specialLanguages[][6] = {
     "", // Hatran
     "", // Multani
     "", // OldHungarian
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
+    "", // SignWriting
+    "", // Adlam
+    "", // Bhaiksuki
+    "", // Marchen
+    "", // Newa
+    "", // Osage
+    "", // Tangut
+    "", // MasaramGondi
+    "", // Nushu
+    "", // Soyombo
+    "" // ZanabazarSquare
+#else
     ""  // SignWriting
+#endif // Qt >= 5.11
 #else
     "hoc"  // WarangCiti
 #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);
 //        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) {
         const QString altFamilyName = QString::fromUtf8((const char *)value);
         // Extra family names can be aliases or subfamilies.
@@ -674,7 +688,7 @@ QFontEngine::HintStyle defaultHintStyleFromMatch(QFont::HintingPreference hintin
     }
 
     // Removed by Kovid for headless QPA
-	
+
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     if (QHighDpiScaling::isActive())
         return QFontEngine::HintNone;