History

make cmake -DDISABLE_QML=1 work again

Seth Alves committed 7 years ago

Commit 8f21ade1 parent d6c702711 files · +185 −76Browse files

Showing the changes to interface/src/ConnectionMonitor.cpp (1 of 11 files). Show all

Unified · Split

interface/src/ConnectionMonitor.cpp+4−0
@@ -48,7 +48,9 @@ void ConnectionMonitor::init() { · 47 unmodified lines
48 emit setRedirectErrorState(REDIRECT_HIFI_ADDRESS, "", 5);48 emit setRedirectErrorState(REDIRECT_HIFI_ADDRESS, "", 5);
49 } else {49 } else {
50 qDebug() << "ConnectionMonitor: Showing connection failure window";50 qDebug() << "ConnectionMonitor: Showing connection failure window";
51#if !defined(DISABLE_QML)
51 DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(true);52 DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(true);
53#endif
52 }54 }
53 });55 });
54}56}
@@ -59,8 +61,10 @@ void ConnectionMonitor::startTimer() { · 4 unmodified lines
59 61
60void ConnectionMonitor::stopTimer() {62void ConnectionMonitor::stopTimer() {
61 _timer.stop();63 _timer.stop();
64#if !defined(DISABLE_QML)
62 bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();65 bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
63 if (!enableInterstitial) {66 if (!enableInterstitial) {
64 DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(false);67 DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(false);
65 }68 }
69#endif
66}70}