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
4848 emit setRedirectErrorState(REDIRECT_HIFI_ADDRESS, "", 5);
4949 } else {
5050 qDebug() << "ConnectionMonitor: Showing connection failure window";
51+#if !defined(DISABLE_QML)
5152 DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(true);
53+#endif
5254 }
5355 });
5456 }
@@ -59,8 +61,10 @@ void ConnectionMonitor::startTimer() { · 4 unmodified lines
5961
6062 void ConnectionMonitor::stopTimer() {
6163 _timer.stop();
64+#if !defined(DISABLE_QML)
6265 bool enableInterstitial = DependencyManager::get<NodeList>()->getDomainHandler().getInterstitialModeEnabled();
6366 if (!enableInterstitial) {
6467 DependencyManager::get<DialogsManager>()->setDomainConnectionFailureVisibility(false);
6568 }
69+#endif
6670 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t