From cb9cb6eb09a0ac13d8fef6652167cbc9d9c3f2bc Mon Sep 17 00:00:00 2001 From: xiphon Date: Tue, 3 Sep 2019 18:41:08 +0000 Subject: FontAwesome: bump to 5.10.2 --- fonts/FontAwesome/FontAwesome.qml | 14 +++++++++++++- fonts/FontAwesome/fa-brands-400.ttf | Bin 0 -> 129284 bytes fonts/FontAwesome/fa-regular-400.ttf | Bin 0 -> 34096 bytes fonts/FontAwesome/fa-solid-900.ttf | Bin 0 -> 191836 bytes fonts/FontAwesome/fontawesome-webfont.ttf | Bin 165548 -> 0 bytes pages/History.qml | 2 +- qml.qrc | 4 +++- 7 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 fonts/FontAwesome/fa-brands-400.ttf create mode 100644 fonts/FontAwesome/fa-regular-400.ttf create mode 100644 fonts/FontAwesome/fa-solid-900.ttf delete mode 100644 fonts/FontAwesome/fontawesome-webfont.ttf diff --git a/fonts/FontAwesome/FontAwesome.qml b/fonts/FontAwesome/FontAwesome.qml index 136f8a6d..7e5f6d04 100644 --- a/fonts/FontAwesome/FontAwesome.qml +++ b/fonts/FontAwesome/FontAwesome.qml @@ -4,10 +4,22 @@ import QtQuick 2.9 Object { FontLoader { - source: "./fontawesome-webfont.ttf" + source: "./fa-regular-400.ttf" + } + + FontLoader { + id: brands + source: "./fa-brands-400.ttf" + } + + FontLoader { + id: solid + source: "./fa-solid-900.ttf" } property string fontFamily: "FontAwesome" + property string fontFamilyBrands: brands.name + property string fontFamilySolid: solid.name // Icons property string addressBook : "\uf2b9" diff --git a/fonts/FontAwesome/fa-brands-400.ttf b/fonts/FontAwesome/fa-brands-400.ttf new file mode 100644 index 00000000..aa1687de Binary files /dev/null and b/fonts/FontAwesome/fa-brands-400.ttf differ diff --git a/fonts/FontAwesome/fa-regular-400.ttf b/fonts/FontAwesome/fa-regular-400.ttf new file mode 100644 index 00000000..34629a6d Binary files /dev/null and b/fonts/FontAwesome/fa-regular-400.ttf differ diff --git a/fonts/FontAwesome/fa-solid-900.ttf b/fonts/FontAwesome/fa-solid-900.ttf new file mode 100644 index 00000000..704a2a99 Binary files /dev/null and b/fonts/FontAwesome/fa-solid-900.ttf differ diff --git a/fonts/FontAwesome/fontawesome-webfont.ttf b/fonts/FontAwesome/fontawesome-webfont.ttf deleted file mode 100644 index 35acda2f..00000000 Binary files a/fonts/FontAwesome/fontawesome-webfont.ttf and /dev/null differ diff --git a/pages/History.qml b/pages/History.qml index 4a1d9515..2dc04de8 100644 --- a/pages/History.qml +++ b/pages/History.qml @@ -939,7 +939,7 @@ Rectangle { anchors.leftMargin: 10 text: FontAwesome.productHunt small: true - label.font.family: FontAwesome.fontFamily + label.font.family: FontAwesome.fontFamilyBrands fontSize: 18 width: 36 diff --git a/qml.qrc b/qml.qrc index 29f68f1a..0b8d9f73 100644 --- a/qml.qrc +++ b/qml.qrc @@ -180,7 +180,9 @@ images/merchant/arrow_right.png images/merchant/bg.png images/merchant/input_box.png - fonts/FontAwesome/fontawesome-webfont.ttf + fonts/FontAwesome/fa-brands-400.ttf + fonts/FontAwesome/fa-regular-400.ttf + fonts/FontAwesome/fa-solid-900.ttf fonts/FontAwesome/FontAwesome.qml fonts/FontAwesome/Object.qml fonts/FontAwesome/qmldir -- cgit v1.2.3