From afbd2ebc023d50ee904330b01f9b48779e198906 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 9 May 2024 23:23:19 +0800 Subject: [PATCH 1/2] Remove all use of MacExtras Signed-off-by: Claudio Cambra --- src/common/utility_mac.mm | 1 - src/gui/CMakeLists.txt | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/common/utility_mac.mm b/src/common/utility_mac.mm index b7e74c7130522..da224d4a88383 100644 --- a/src/common/utility_mac.mm +++ b/src/common/utility_mac.mm @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index a10ccbe1c563d..290e16e9443d8 100644 --- 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() From 4bd09746966eafaf708d3385b7c656c112f6ce6a Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Thu, 9 May 2024 23:25:50 +0800 Subject: [PATCH 2/2] Remove use of setMargin on QVBoxLayout, not present in Qt6 Signed-off-by: Claudio Cambra --- src/gui/accountsettings.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index 1517986e32d5b..2b581e3606cf5 100644 --- 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 {