From 6823e7cae06325b455e2e7cccdc953044b0cb67e Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 20 Jun 2017 12:20:14 -0700 Subject: [PATCH] Audio -> HifiAudio to avoid collision --- interface/resources/qml/hifi/tablet/Tablet.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml index 459c53074a..43672190dd 100644 --- a/interface/resources/qml/hifi/tablet/Tablet.qml +++ b/interface/resources/qml/hifi/tablet/Tablet.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtGraphicalEffects 1.0 import "../../styles-uit" -import "../audio" as Audio +import "../audio" as HifiAudio Item { id: tablet @@ -101,7 +101,7 @@ Item { } } - Audio.MicBar { + HifiAudio.MicBar { anchors { left: parent.left leftMargin: 30