From e638ed0272ca042f3ad77b680665a91ed8a35cce Mon Sep 17 00:00:00 2001 From: Sander Ferdinand Date: Sat, 31 Mar 2018 03:25:20 +0200 Subject: Explicitly import MoneroComponents; prevent namespace pollution --- components/ProgressBar.qml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'components/ProgressBar.qml') diff --git a/components/ProgressBar.qml b/components/ProgressBar.qml index 6e691d6e..5fc5ec9b 100644 --- a/components/ProgressBar.qml +++ b/components/ProgressBar.qml @@ -28,7 +28,8 @@ import QtQuick 2.0 import moneroComponents.Wallet 1.0 -import "." 1.0 + +import "../components" as MoneroComponents Rectangle { id: item @@ -62,7 +63,7 @@ Rectangle { id: progressText anchors.top: parent.top anchors.topMargin: 6 - font.family: Style.fontMedium.name + font.family: MoneroComponents.Style.fontMedium.name font.pixelSize: 13 * scaleRatio font.bold: true color: "white" @@ -75,7 +76,7 @@ Rectangle { anchors.top: parent.top anchors.topMargin: 6 anchors.right: parent.right - font.family: Style.fontMedium.name + font.family: MoneroComponents.Style.fontMedium.name font.pixelSize: 13 * scaleRatio font.bold: true color: "white" -- cgit v1.2.3