From 36ff765d7f15a54a9ab19e5872ad38cd28bf7de2 Mon Sep 17 00:00:00 2001 From: Vladyslav Stelmakhovskyi Date: Sun, 18 Jun 2017 22:19:28 +0200 Subject: [PATCH] Make sure registered object have different name from iport alias --- interface/resources/qml/hifi/audio/Audio.qml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml index a30aba2a6b..929752f925 100644 --- a/interface/resources/qml/hifi/audio/Audio.qml +++ b/interface/resources/qml/hifi/audio/Audio.qml @@ -18,7 +18,7 @@ import QtQuick.Layouts 1.3 import "../../styles-uit" import "../../controls-uit" as HifiControls import "../../windows" -import "./" as Audio +import "./" as AudioControls Rectangle { id: root; @@ -57,7 +57,7 @@ Rectangle { x: 16; // padding does not work spacing: 16; - Audio.CheckBox { + AudioControls.CheckBox { text: qsTr("Mute microphone"); checked: Audio.muted; onClicked: { @@ -65,7 +65,7 @@ Rectangle { checked = Qt.binding(function() { return Audio.muted; }); // restore binding } } - Audio.CheckBox { + AudioControls.CheckBox { text: qsTr("Enable noise reduction"); checked: Audio.noiseReduction; onClicked: { @@ -73,7 +73,7 @@ Rectangle { checked = Qt.binding(function() { return Audio.noiseReduction; }); // restore binding } } - Audio.CheckBox { + AudioControls.CheckBox { text: qsTr("Show audio level meter"); checked: AvatarInputs.showAudioTools; onClicked: { @@ -110,7 +110,7 @@ Rectangle { delegate: Item { width: parent.width; height: 36; - Audio.CheckBox { + AudioControls.CheckBox { text: display; checked: selected; onClicked: { @@ -148,7 +148,7 @@ Rectangle { delegate: Item { width: parent.width; height: 36; - Audio.CheckBox { + AudioControls.CheckBox { text: display; checked: selected; onClicked: {