fix macOS build

rcaelers · Feb 15, 2025 · da173b7 · da173b7
1 parent 8976633
commit da173b7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -203,7 +203,7 @@ endif()
 if (UNIX AND (NOT APPLE))
   option(WITH_WAYLAND "Enable Wayland support" ON)
 else()
-  set(WITH_WAYLAND  OFF)
+  set(WITH_WAYLAND OFF)
 endif()
 
 #----------------------------------------------------------------------------------------------------
@@ -399,7 +399,7 @@ if ("${WITH_UI}" STREQUAL "Qt")
 
   message(STATUS "Checking for: Qt")
   find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
-  find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Core Gui Svg LinguistTools Xml WaylandClient ${EXTRA_QT_COMPONENTS} REQUIRED)
+  find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Widgets Core Gui Svg LinguistTools Xml ${EXTRA_QT_COMPONENTS} REQUIRED)
   qt6_standard_project_setup()
   set(CMAKE_AUTORCC ON)
 

diff --git a/libs/utils/src/Paths.cc b/libs/utils/src/Paths.cc
@@ -405,7 +405,7 @@ Paths::get_state_directory()
 #  endif
               ret = std::filesystem::path(user_state_dir) / app_name;
 #else
-              ret = get_home_directory() / fot_app_name;
+              ret = get_home_directory() / dot_app_name;
 #endif
             }
 

diff --git a/ui/app/toolkits/qt/BreakWindow.cc b/ui/app/toolkits/qt/BreakWindow.cc
@@ -49,7 +49,9 @@ BreakWindow::BreakWindow(std::shared_ptr<IApplicationContext> app, QScreen *scre
 {
   TRACE_ENTRY();
   block_mode = GUIConfig::block_mode()();
+#if defined(HAVE_WAYLAND)
   window_manager = std::dynamic_pointer_cast<IToolkitUnixPrivate>(this->app->get_toolkit())->get_wayland_window_manager();
+#endif
 }
 
 void

diff --git a/ui/app/toolkits/qt/PreludeWindow.cc b/ui/app/toolkits/qt/PreludeWindow.cc
@@ -47,7 +47,9 @@ PreludeWindow::PreludeWindow(std::shared_ptr<IApplicationContext> app, QScreen *
   , break_id(break_id)
   , screen(screen)
 {
+#if defined(HAVE_WAYLAND)
   window_manager = std::dynamic_pointer_cast<IToolkitUnixPrivate>(app->get_toolkit())->get_wayland_window_manager();
+#endif
 
   auto *timer = new QTimer(this);
   connect(timer, SIGNAL(timeout()), this, SLOT(update()));
-Original file line number
+Diff line change
@@ Expand Up / @@ -405,7 +405,7 @@ Paths::get_state_directory() @@
     #  endif
                   ret = std::filesystem::path(user_state_dir) / app_name;
     #else
-                  ret = get_home_directory() / fot_app_name;
+                  ret = get_home_directory() / dot_app_name;
     #endif
                 }
@@ Expand Down @@