Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 22:17:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'android_remove_mic_bar' of https://github.com/gcalero/hifi into android_remove_mic_bar

Browse source
This commit is contained in:
Gabriel Calero 2018-05-29 17:22:04 -03:00
commit b99f901595
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -3011,9 +3011,11 @@ void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext(); auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext();
surfaceContext->setContextProperty("Stats", Stats::getInstance()); surfaceContext->setContextProperty("Stats", Stats::getInstance());
#if !defined(Q_OS_ANDROID)
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();
auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml"); auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
offscreenUi->show(qml, "AvatarInputsBar"); offscreenUi->show(qml, "AvatarInputsBar");
#endif
} }
void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) { void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {