Bundle fonts into the app
- Create QApplication instance before font initialization, otherwise
QFontDatabase crashes.
- Fix broken QRC font paths
1 files changed, 9 insertions, 11 deletions
diff --git a/src/main.cc b/src/main.cc
index 5f03c2c3..af1a7f9a 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -23,22 +23,20 @@
int main(int argc, char *argv[])
{
+ QApplication app(argc, argv);
+
QCoreApplication::setApplicationName("nheko");
QCoreApplication::setApplicationVersion("Ωμέγa");
QCoreApplication::setOrganizationName("Nheko");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-Light.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-Regular.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-Italic.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-Bold.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-BoldItalic.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-Semibold.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-SemiboldItalic.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-ExtraBold.ttf");
- QFontDatabase::addApplicationFont(":/fonts/OpenSans-ExtraBoldItalic.ttf");
- QFontDatabase::addApplicationFont(":/fonts/emojione-android.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Regular.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Italic.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Bold.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-BoldItalic.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Semibold.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-SemiboldItalic.ttf");
+ QFontDatabase::addApplicationFont(":/fonts/fonts/EmojiOne/emojione-android.ttf");
- QApplication app(argc, argv);
app.setWindowIcon(QIcon(":/logos/nheko.png"));
app.setStyleSheet(
|
