History

Merge pull request #15919 from howard-stearns/mac-sleep-monitor

Mac sleep monitor

Shannon Romano committed 7 years ago

Commit 7ea86752 parents 09729fb 7ce6dd73 files · +89 −0Browse files

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

Unified · Split

interface/src/Application.cpp+10−0
@@ -257,6 +257,10 @@ extern "C" { · 256 unmodified lines
257257 }
258258 #endif
259259
260+#ifdef Q_OS_MAC
261+#include "MacHelper.h"
262+#endif
263+
260264 #if defined(Q_OS_ANDROID)
261265 #include <android/log.h>
262266 #include "AndroidHelper.h"
@@ -960,6 +964,9 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 697 unmodified lines
960964 DependencyManager::set<KeyboardScriptingInterface>();
961965 DependencyManager::set<GrabManager>();
962966 DependencyManager::set<AvatarPackager>();
967+#ifdef Q_OS_MAC
968+ DependencyManager::set<MacHelper>();
969+#endif
963970
964971 QString setBookmarkValue = getCmdOption(argc, constArgv, "--setBookmark");
965972 if (!setBookmarkValue.isEmpty()) {
@@ -2856,6 +2863,9 @@ Application::~Application() { · 1890 unmodified lines
28562863 _gameWorkload.shutdown();
28572864
28582865 DependencyManager::destroy<Preferences>();
2866+#ifdef Q_OS_MAC
2867+ DependencyManager::destroy<MacHelper>();
2868+#endif
28592869
28602870 _entityClipboard->eraseAllOctreeElements();
28612871 _entityClipboard.reset();

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