Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 18:23:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12735 from druiz17/RC66

Browse source 
Fix name conflict with c++ class and qml file(RC66)
This commit is contained in:
John Conklin II 2018-03-29 12:06:15 -07:00 committed by GitHub
commit d6b652bdf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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({
title: 'Audio Scope',
source: qml,
@ -14,4 +14,4 @@ window.closed.connect(function () {
AudioScope.setServerEcho(false);
AudioScope.selectAudioScopeFiveFrames();
Script.stop();
});
});