nextcloud
/
desktop
mirror of https://github.com/nextcloud/desktop
0
0
Fork 0
Code Issues Releases Wiki Activity

Do not compile things that require the app bundle when building the client without the app bundle on macOS 

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
This commit is contained in:
Claudio Cambra 2022-06-06 19:05:12 +02:00
parent 5c326c2caa
commit 9dd9c46493
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -105,6 +105,7 @@ if(APPLE AND BUILD_OWNCLOUD_OSX_BUNDLE)
set(OWNCLOUD_OSX_BUNDLE "${APPLICATION_NAME}.app")
set(LIB_INSTALL_DIR "${APPLICATION_NAME}.app/Contents/MacOS")
set(BIN_INSTALL_DIR "${APPLICATION_NAME}.app/Contents/MacOS")
add_definitions(-DBUILD_OWNCLOUD_OSX_BUNDLE)
endif()

6
src/gui/systray.cpp
View File

@ -99,7 +99,7 @@ Systray::Systray()
qmlRegisterType<WheelHandler>("com.nextcloud.desktopclient", 1, 0, "WheelHandler");
#ifdef Q_OS_MACOS
#if defined(Q_OS_MACOS) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
setUserNotificationCenterDelegate();
checkNotificationAuth(MacNotificationAuthorizationOptions::Default); // No provisional auth, ask user explicitly first time
registerNotificationCategories(QString(tr("Download")));
@ -307,7 +307,7 @@ void Systray::showMessage(const QString &title, const QString &message, MessageI
QDBusConnection::sessionBus().asyncCall(method);
} else
#endif
#ifdef Q_OS_OSX
#if defined(Q_OS_MACOS) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
if (canOsXSendUserNotification()) {
sendOsXUserNotification(title, message);
} else
@ -319,7 +319,7 @@ void Systray::showMessage(const QString &title, const QString &message, MessageI
void Systray::showUpdateMessage(const QString &title, const QString &message, const QUrl &webUrl)
{
#ifdef Q_OS_MACOS
#if defined(Q_OS_MACOS) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
sendOsXUpdateNotification(title, message, webUrl);
#else // TODO: Implement custom notifications (i.e. actionable) for other OSes
Q_UNUSED(webUrl);

2
src/gui/updater/updater.cpp
View File

@ -141,7 +141,7 @@ Updater *Updater::create()
return nullptr;
}
#if defined(Q_OS_MAC) && defined(HAVE_SPARKLE)
#if defined(Q_OS_MACOS) && defined(HAVE_SPARKLE) && defined(BUILD_OWNCLOUD_OSX_BUNDLE)
return new SparkleUpdater(url);
#elif defined(Q_OS_WIN32)
// Also for MSI