Merge pull request #220 from larteyoh/backup

fix fontawesome icons

qml/components/ComboBox.qml

@@ -1,6 +1,8 @@
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 
+import FontAwesome 1.0
+
 import "." as NeroshopComponents // Triangle (in Triangle.qml)
 
 ComboBox {
@@ -70,6 +72,7 @@ ComboBox {
             text: qsTr("\uf078")
             color: control.pressed ? "#d3d3d3" : "#ffffff"
             font.bold: true
+            font.family: FontAwesome.fontFamily
         }
     }
 

qml/components/SettingsDialog.qml

@@ -1122,6 +1122,7 @@ Item {
                             verticalAlignment: Text.AlignVCenter
                             horizontalAlignment: Text.AlignHCenter
                             font.bold: true
+                            font.family: FontAwesome.fontFamily
                         }
                     }                                 
                 }
@@ -1163,6 +1164,7 @@ Item {
                             verticalAlignment: Text.AlignVCenter
                             horizontalAlignment: Text.AlignHCenter
                             font.bold: true
+                            font.family: FontAwesome.fontFamily
                         }
                     }                                  
                 }