Only bundle Droid fallback font on Embedded edition

Normal Linux/Windows/Mac should have support for Asian fonts themselves.
raspberrypi · Mar 24, 2022 · 93811df · 93811df
1 parent 6861a2a
commit 93811df
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/fonts/DroidSansFallback.ttf → ...onts/truetype/droid/DroidSansFallback.ttf b/src/fonts/DroidSansFallback.ttf → ...onts/truetype/droid/DroidSansFallback.ttf
diff --git a/src/main.cpp b/src/main.cpp
@@ -76,7 +76,8 @@ int main(int argc, char *argv[])
     /* Set default font */
     QStringList fontList = QFontDatabase::applicationFontFamilies(QFontDatabase::addApplicationFont(":/fonts/Roboto-Regular.ttf"));
     QGuiApplication::setFont(QFont(fontList.first(), 10));
-    QFontDatabase::addApplicationFont(":/fonts/DroidSansFallback.ttf");
+    if (QFile::exists("/usr/share/fonts/truetype/droid/DroidSansFallback.ttf"))
+            QFontDatabase::addApplicationFont("/usr/share/fonts/truetype/droid/DroidSansFallback.ttf");
 
     QLocale::Language l = QLocale::system().language();
     if (l == QLocale::AnyLanguage || l == QLocale::C)

diff --git a/src/qml.qrc b/src/qml.qrc
@@ -35,6 +35,5 @@
         <file>qmlcomponents/ImButton.qml</file>
         <file>qmlcomponents/ImCheckBox.qml</file>
         <file>qmlcomponents/ImRadioButton.qml</file>
-        <file>fonts/DroidSansFallback.ttf</file>
     </qresource>
 </RCC>