Mac sleep monitor
Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -257,6 +257,10 @@ extern "C" { · 256 unmodified lines | ||
| 257 | 257 | } |
| 258 | 258 | #endif |
| 259 | 259 | |
| 260 | +#ifdef Q_OS_MAC | |
| 261 | +#include "MacHelper.h" | |
| 262 | +#endif | |
| 263 | + | |
| 260 | 264 | #if defined(Q_OS_ANDROID) |
| 261 | 265 | #include <android/log.h> |
| 262 | 266 | #include "AndroidHelper.h" |
| @@ -960,6 +964,9 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 697 unmodified lines | ||
| 960 | 964 | DependencyManager::set<KeyboardScriptingInterface>(); |
| 961 | 965 | DependencyManager::set<GrabManager>(); |
| 962 | 966 | DependencyManager::set<AvatarPackager>(); |
| 967 | +#ifdef Q_OS_MAC | |
| 968 | + DependencyManager::set<MacHelper>(); | |
| 969 | +#endif | |
| 963 | 970 | |
| 964 | 971 | QString setBookmarkValue = getCmdOption(argc, constArgv, "--setBookmark"); |
| 965 | 972 | if (!setBookmarkValue.isEmpty()) { |
| @@ -2856,6 +2863,9 @@ Application::~Application() { · 1890 unmodified lines | ||
| 2856 | 2863 | _gameWorkload.shutdown(); |
| 2857 | 2864 | |
| 2858 | 2865 | DependencyManager::destroy<Preferences>(); |
| 2866 | +#ifdef Q_OS_MAC | |
| 2867 | + DependencyManager::destroy<MacHelper>(); | |
| 2868 | +#endif | |
| 2859 | 2869 | |
| 2860 | 2870 | _entityClipboard->eraseAllOctreeElements(); |
| 2861 | 2871 | _entityClipboard.reset(); |