squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-18 22:47:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14783 from glassez/macutils

Browse Source 
Don't use "Qt Mac Extras" module
This commit is contained in:
Vladimir Golovnev
2021-04-16 18:40:40 +03:00
committed by GitHub
parent 31d84100cd 35032d7eed
commit e0d17e496a
6 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/mainwindow.cpp
View File

@@ -48,10 +48,6 @@
#include <QtGlobal>
#include <QTimer>
#ifdef Q_OS_MACOS
#include <QtMac>
#include <QtMacExtras>
#endif
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)) && defined(QT_DBUS_LIB)
#include <QDBusConnection>
#include "qtnotify/notifications.h"
@@ -1627,12 +1623,12 @@ void MainWindow::reloadSessionStats()
#ifdef Q_OS_MACOS
if (status.payloadDownloadRate > 0)
{
QtMac::setBadgeLabelText(tr("%1/s", "s is a shorthand for seconds")
MacUtils::setBadgeLabelText(tr("%1/s", "s is a shorthand for seconds")
.arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate)));
}
else if (!QtMac::badgeLabelText().isEmpty())
else if (!MacUtils::badgeLabelText().isEmpty())
{
QtMac::setBadgeLabelText("");
MacUtils::setBadgeLabelText("");
}
#else
if (m_systrayIcon)