diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 977b38fb0..0be45f6c0 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -358,6 +358,7 @@ if(IOS) include(cmake/ios.cmake) include(cmake/ios-arch-fixup.cmake) elseif(APPLE AND NOT IOS AND NOT DEFINED MACOS_NE) + include(cmake/osxtools.cmake) include(cmake/macos.cmake) elseif(APPLE AND NOT IOS AND MACOS_NE) include(cmake/macos_ne.cmake) diff --git a/client/ui/controllers/pageController.cpp b/client/ui/controllers/pageController.cpp index 97ddf5d8a..2ded5f554 100644 --- a/client/ui/controllers/pageController.cpp +++ b/client/ui/controllers/pageController.cpp @@ -24,7 +24,7 @@ PageController::PageController(const QSharedPointer &serversModel, AndroidController::instance()->setNavigationBarColor(initialPageNavigationBarColor); #endif -#if defined Q_OS_MAC and !defined MACOS_NE +#if defined Q_OS_MACX and !defined MACOS_NE connect(this, &PageController::raiseMainWindow, []() { setDockIconVisible(true); }); connect(this, &PageController::hideMainWindow, []() { setDockIconVisible(false); }); #endif