Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16566 from sethalves/fix-disable-qml-on-linux

Browse source 
allow Linux interface to connect to domain when DISABLE_QML is true
This commit is contained in:
Bradley Austin Davis 2019-12-10 12:35:18 -08:00 committed by GitHub
commit d5540fbcf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Application.cpp
View file

@ -3395,6 +3395,10 @@ void Application::initializeUi() {
setIsInterstitialMode(true);
#if defined(DISABLE_QML) && defined(Q_OS_LINUX)
resumeAfterLoginDialogActionTaken();
#endif
}
@ -5662,6 +5666,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
return;
}
#if !defined(DISABLE_QML)
if (!isHMDMode() && getDesktopTabletBecomesToolbarSetting()) {
auto toolbar = DependencyManager::get<ToolbarScriptingInterface>()->getToolbar("com.highfidelity.interface.toolbar.system");
toolbar->writeProperty("visible", true);
@ -5671,6 +5676,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
}
updateSystemTabletMode();
#endif
{
auto userInputMapper = DependencyManager::get<UserInputMapper>();