diff --git a/interface/resources/qml/styles-uit/AnonymousProRegular.qml b/interface/resources/qml/styles-uit/AnonymousProRegular.qml index f2a07372a4..5e226bea99 100644 --- a/interface/resources/qml/styles-uit/AnonymousProRegular.qml +++ b/interface/resources/qml/styles-uit/AnonymousProRegular.qml @@ -14,10 +14,10 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: iconFont; source: "../../fonts/AnonymousPro-Regular.ttf"; } + FontLoader { id: anonymousProRegular; source: "../../fonts/AnonymousPro-Regular.ttf"; } property real size: 32 font.pointSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: iconFont.name + font.family: anonymousProRegular.name } diff --git a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml index 06ab2df0c9..085ce0537c 100644 --- a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml +++ b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml @@ -14,10 +14,10 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: iconFont; source: "../../fonts/FiraSans-SemiBold.ttf"; } + FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; } property real size: 32 font.pointSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: iconFont.name + font.family: firaSansSemiBold.name } diff --git a/interface/resources/qml/styles-uit/HiFiGlyphs.qml b/interface/resources/qml/styles-uit/HiFiGlyphs.qml index 7b1d6ce441..854e893441 100644 --- a/interface/resources/qml/styles-uit/HiFiGlyphs.qml +++ b/interface/resources/qml/styles-uit/HiFiGlyphs.qml @@ -14,12 +14,12 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: iconFont; source: "../../fonts/hifi-glyphs.ttf"; } + FontLoader { id: hiFiGlyphs; source: "../../fonts/hifi-glyphs.ttf"; } property int size: 32 font.pixelSize: size // Size this font in pixels because it's UI widgets. width: size height: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: iconFont.name + font.family: hiFiGlyphs.name } diff --git a/interface/resources/qml/styles-uit/RalewayBold.qml b/interface/resources/qml/styles-uit/RalewayBold.qml index 1f6e536d67..359f0feda8 100644 --- a/interface/resources/qml/styles-uit/RalewayBold.qml +++ b/interface/resources/qml/styles-uit/RalewayBold.qml @@ -14,11 +14,11 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: iconFont; source: "../../fonts/Raleway-Bold.ttf"; } + FontLoader { id: ralewayBold; source: "../../fonts/Raleway-Bold.ttf"; } property real size: 32 font.pointSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: iconFont.name + font.family: ralewayBold.name font.bold: true // Font seems to need this in order to display bold. } diff --git a/interface/resources/qml/styles-uit/RalewayLight.qml b/interface/resources/qml/styles-uit/RalewayLight.qml index 5403a1bd00..8e24d74a46 100644 --- a/interface/resources/qml/styles-uit/RalewayLight.qml +++ b/interface/resources/qml/styles-uit/RalewayLight.qml @@ -14,10 +14,10 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: iconFont; source: "../../fonts/Raleway-Light.ttf"; } + FontLoader { id: ralewayLight; source: "../../fonts/Raleway-Light.ttf"; } property real size: 32 font.pointSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: iconFont.name + font.family: ralewayLight.name } diff --git a/interface/resources/qml/styles-uit/RalewayRegular.qml b/interface/resources/qml/styles-uit/RalewayRegular.qml index 40a34f23b8..c04db54e9d 100644 --- a/interface/resources/qml/styles-uit/RalewayRegular.qml +++ b/interface/resources/qml/styles-uit/RalewayRegular.qml @@ -14,10 +14,10 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: iconFont; source: "../../fonts/Raleway-Regular.ttf"; } + FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; } property real size: 32 font.pointSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: iconFont.name + font.family: ralewayRegular.name } diff --git a/interface/resources/qml/styles-uit/RalewaySemibold.qml b/interface/resources/qml/styles-uit/RalewaySemibold.qml index 61ce33998b..374696f902 100644 --- a/interface/resources/qml/styles-uit/RalewaySemibold.qml +++ b/interface/resources/qml/styles-uit/RalewaySemibold.qml @@ -14,10 +14,10 @@ import QtQuick.Controls.Styles 1.4 Text { id: root - FontLoader { id: iconFont; source: "../../fonts/Raleway-Semibold.ttf"; } + FontLoader { id: ralewaySemibold; source: "../../fonts/Raleway-Semibold.ttf"; } property real size: 32 font.pointSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: iconFont.name + font.family: ralewaySemibold.name }