diff options
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index ab030ea4..f3a195b9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -21,7 +21,7 @@ // in theory we can enable this everywhere, but the header is missing on some of our CI systems and // it is too much effort to install. -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) #include <QtGui/qpa/qplatformwindow_p.h> #endif @@ -35,7 +35,7 @@ #include "Utils.h" #include "config/nheko.h" -#if defined(Q_OS_MAC) +#if defined(Q_OS_MACOS) #include "emoji/MacHelper.h" #include "notifications/Manager.h" #endif @@ -114,7 +114,7 @@ registerSignalHandlers() #endif -#if defined(GSTREAMER_AVAILABLE) && (defined(Q_OS_MAC) || defined(Q_OS_WINDOWS)) +#if defined(GSTREAMER_AVAILABLE) && (defined(Q_OS_MACOS) || defined(Q_OS_WINDOWS)) GMainLoop *gloop = 0; GThread *gthread = 0; @@ -168,7 +168,7 @@ main(int argc, char *argv[]) // this needs to be after setting the application name. Or how would we find our settings // file then? -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) if (qgetenv("QT_SCALE_FACTOR").size() == 0) { float factor = utils::scaleFactor(); @@ -254,7 +254,7 @@ main(int argc, char *argv[]) if (!singleapp.isPrimaryInstance()) { auto token = qgetenv("XDG_ACTIVATION_TOKEN"); -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) // getting a valid activation token on wayland is a bit of a pain, it works most reliably // when you have an actual window, that has the focus... auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>(); @@ -304,7 +304,7 @@ main(int argc, char *argv[]) return 0; } -#if !defined(Q_OS_MAC) +#if !defined(Q_OS_MACOS) app.setWindowIcon(QIcon::fromTheme(QStringLiteral("nheko"), QIcon{":/logos/nheko.png"})); #endif #ifdef NHEKO_FLATPAK @@ -320,7 +320,7 @@ main(int argc, char *argv[]) registerSignalHandlers(); -#if defined(GSTREAMER_AVAILABLE) && (defined(Q_OS_MAC) || defined(Q_OS_WINDOWS)) +#if defined(GSTREAMER_AVAILABLE) && (defined(Q_OS_MACOS) || defined(Q_OS_WINDOWS)) // If the version of Qt we're running in does not use GLib, we need to // start a GMainLoop so that gstreamer can dispatch events. const QMetaObject *mo = QAbstractEventDispatcher::instance(qApp->thread())->metaObject(); @@ -469,7 +469,7 @@ main(int argc, char *argv[]) QDesktopServices::setUrlHandler( QStringLiteral("matrix"), ChatPage::instance(), "handleMatrixUri"); -#if defined(Q_OS_MAC) +#if defined(Q_OS_MACOS) // Temporary solution for the emoji picker until // nheko has a proper menu bar with more functionality. MacHelper::initializeMenus(); |