From dd96c098e82946e822b5fc76fce6276038e60a6f Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 30 Nov 2021 16:49:47 +0100
Subject: [ui] revert workarounds

---
 gui/main.cpp | 6 ------
 gui/main.qml | 4 +++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/gui/main.cpp b/gui/main.cpp
index 581aedd..c9750bd 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -56,12 +56,6 @@ int main(int argc, char **argv) {
 
     Backend backend;
 
-    const int fontId = QFontDatabase::addApplicationFont(":/resources/fonts/Roboto-Regular.ttf");
-    if (fontId == -1)
-        qWarning() << "Failed to add Roboto as app font";
-    else
-        qDebug() << QFontDatabase::applicationFontFamilies(fontId);
-
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
     QApplication::setApplicationVersion(backend.getVersion());
     QApplication app(argc, argv);
diff --git a/gui/main.qml b/gui/main.qml
index a3a0922..d9cbec4 100644
--- a/gui/main.qml
+++ b/gui/main.qml
@@ -168,10 +168,12 @@ ApplicationWindow {
 
     Component.onCompleted: {
         loader.source = "components/Splash.qml"
+        // XXX workaround for custom font not working in osx
+        /*
         if (Qt.platform.os === "osx") {
-            // XXX workaround for custom font not working in osx
             root.font.family = robotoFont.name
             root.font.weight = Font.Light
         }
+        */
     }
 }
-- 
cgit v1.2.3