Merge pull request #6743 from nextcloud/bugfix/mac-build-qtsix

Fix macOS build on master
nextcloud · May 13, 2024 · 390d6a5 · 390d6a5
2 parents 7a49312 + 4bd0974
commit 390d6a5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/src/common/utility_mac.mm b/src/common/utility_mac.mm
@@ -22,7 +22,6 @@
 #include <QCoreApplication>
 #include <QDir>
 #include <QLoggingCategory>
-#include <QtMacExtras/QtMacExtras>
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <CoreServices/CoreServices.h>

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -699,14 +699,10 @@ if( UNIX AND NOT APPLE )
 endif()
 
 if (APPLE)
-    find_package(Qt${QT_MAJOR_VERSION} COMPONENTS MacExtras)
-
     if (BUILD_FILE_PROVIDER_MODULE)
-        target_link_libraries(nextcloudCore PUBLIC Qt::MacExtras "-framework UserNotifications -framework FileProvider")
+        target_link_libraries(nextcloudCore PUBLIC "-framework UserNotifications -framework FileProvider")
     elseif(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.14)
-        target_link_libraries(nextcloudCore PUBLIC Qt::MacExtras "-framework UserNotifications")
-    else()
-        target_link_libraries(nextcloudCore PUBLIC Qt::MacExtras)
+        target_link_libraries(nextcloudCore PUBLIC "-framework UserNotifications")
     endif()
 endif()
 

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
@@ -204,7 +204,6 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
         const auto fpAccountUserIdAtHost = _accountState->account()->userIdAtHostWithPort();
         const auto fpSettingsController = Mac::FileProviderSettingsController::instance();
         const auto fpSettingsWidget = fpSettingsController->settingsViewWidget(fpAccountUserIdAtHost, fileProviderTab);
-        fpSettingsLayout->setMargin(0);
         fpSettingsLayout->addWidget(fpSettingsWidget);
         fileProviderTab->setLayout(fpSettingsLayout);
     } else {