summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorDeepBlueV7.X <nicolas.werner@hotmail.de>2023-02-23 17:33:06 +0000
committerGitHub <noreply@github.com>2023-02-23 17:33:06 +0000
commitb4a7f34711518d146f2d27a3d1b371517a2e2200 (patch)
treeed3d2a625fb18bfb2826ebd2521647b7372c296e /src
parentMerge pull request #1385 from Bubu/print_dialog_errors (diff)
parentHonour Qt scaling factor on OpenBSD (diff)
downloadnheko-b4a7f34711518d146f2d27a3d1b371517a2e2200.tar.xz
Merge pull request #1387 from klemensn/support-bsd
support OpenBSD
Diffstat (limited to 'src')
-rw-r--r--src/ChatPage.cpp2
-rw-r--r--src/LoginPage.h2
-rw-r--r--src/main.cpp2
-rw-r--r--src/notifications/Manager.h2
4 files changed, 5 insertions, 3 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp

index 07406cc8..37449980 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp
@@ -1661,7 +1661,7 @@ ChatPage::isRoomActive(const QString &room_id) void ChatPage::removeAllNotifications() { -#if defined(Q_OS_LINUX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) notificationsManager->closeAllNotifications(); #endif } diff --git a/src/LoginPage.h b/src/LoginPage.h
index 3a1f6fd0..f20ba0c6 100644 --- a/src/LoginPage.h +++ b/src/LoginPage.h
@@ -97,6 +97,8 @@ public: return "Nheko on Windows"; #elif defined(Q_OS_FREEBSD) return "Nheko on FreeBSD"; +#elif defined(Q_OS_OPENBSD) + return "Nheko on OpenBSD"; #else return "Nheko"; #endif diff --git a/src/main.cpp b/src/main.cpp
index c4ee83f3..44d0dd64 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -159,7 +159,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_LINUX) || defined(Q_OS_WIN) || defined(Q_OS_FREEBSD) +#if !defined(Q_OS_MACOS) if (qgetenv("QT_SCALE_FACTOR").size() == 0) { float factor = utils::scaleFactor(); diff --git a/src/notifications/Manager.h b/src/notifications/Manager.h
index ee37b3aa..129b5131 100644 --- a/src/notifications/Manager.h +++ b/src/notifications/Manager.h
@@ -53,7 +53,7 @@ public slots: #if defined(NHEKO_DBUS_SYS) public: void closeNotifications(QString roomId); -#if defined(Q_OS_LINUX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) void closeAllNotifications(); #endif