Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 14:52:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix-qml-confict

Browse source
This commit is contained in:
Dante Ruiz 2018-03-29 09:26:05 -07:00
parent 3e23ad4900
commit 8cdb59413d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/AudioScope.qml → interface/resources/qml/AudioScopeUI.qml
View file

@ -12,6 +12,7 @@ import QtQuick 2.5
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
import "styles-uit" import "styles-uit"
import "controls-uit" as HifiControlsUit import "controls-uit" as HifiControlsUit
import "." as HifiRoot
Item { Item {
id: root id: root

4
scripts/developer/utilities/audio/audioScope.js
View file

@ -1,4 +1,4 @@
var qml = Script.resourcesPath() + '/qml/AudioScope.qml'; var qml = Script.resourcesPath() + '/qml/AudioScopeUI.qml';
var window = new OverlayWindow({ var window = new OverlayWindow({
title: 'Audio Scope', title: 'Audio Scope',
source: qml, source: qml,
@ -14,4 +14,4 @@ window.closed.connect(function () {
AudioScope.setServerEcho(false); AudioScope.setServerEcho(false);
AudioScope.selectAudioScopeFiveFrames(); AudioScope.selectAudioScopeFiveFrames();
Script.stop(); Script.stop();
}); });