Merge pull request #2372

cb9cb6e FontAwesome: bump to 5.10.2 (xiphon)
This commit is contained in:
luigi1111 2019-09-04 09:48:58 -05:00
commit 0abaae073d
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
7 changed files with 17 additions and 3 deletions

View file

@ -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"

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -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

View file

@ -178,7 +178,9 @@
<file>images/merchant/arrow_right.png</file>
<file>images/merchant/bg.png</file>
<file>images/merchant/input_box.png</file>
<file>fonts/FontAwesome/fontawesome-webfont.ttf</file>
<file>fonts/FontAwesome/fa-brands-400.ttf</file>
<file>fonts/FontAwesome/fa-regular-400.ttf</file>
<file>fonts/FontAwesome/fa-solid-900.ttf</file>
<file>fonts/FontAwesome/FontAwesome.qml</file>
<file>fonts/FontAwesome/Object.qml</file>
<file>fonts/FontAwesome/qmldir</file>