diff options
author | kali kaneko (leap communications) <kali@leap.se> | 2021-11-30 16:49:47 +0100 |
---|---|---|
committer | kali kaneko (leap communications) <kali@leap.se> | 2021-11-30 21:22:40 +0100 |
commit | dd96c098e82946e822b5fc76fce6276038e60a6f (patch) | |
tree | 1742da53860747536a62e2df7125c2f6aaa3603f | |
parent | 5b8be038a62765c392a5bc73c764245977af1c84 (diff) |
[ui] revert workarounds
-rw-r--r-- | gui/main.cpp | 6 | ||||
-rw-r--r-- | 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 } + */ } } |