diff --git a/src/fonts/DroidSansFallback.ttf b/embedded/imager/board/overlay/usr/share/fonts/truetype/droid/DroidSansFallback.ttf similarity index 100% rename from src/fonts/DroidSansFallback.ttf rename to embedded/imager/board/overlay/usr/share/fonts/truetype/droid/DroidSansFallback.ttf diff --git a/src/main.cpp b/src/main.cpp index e3497c4..75940a7 100644 --- 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 index 1d09f94..8c4da6e 100644 --- a/src/qml.qrc +++ b/src/qml.qrc @@ -35,6 +35,5 @@ qmlcomponents/ImButton.qml qmlcomponents/ImCheckBox.qml qmlcomponents/ImRadioButton.qml - fonts/DroidSansFallback.ttf