Merge pull request #6249 from bil-elmoussaoui/master

Fixes default indicator name
8 years ago · 8d58c52ad8
12 changed files with 1 additions and 1 deletions
--- a/dist/unix/menuicons/128x128/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/128x128/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/16x16/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/16x16/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/192x192/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/192x192/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/22x22/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/22x22/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/24x24/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/24x24/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/32x32/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/32x32/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/36x36/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/36x36/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/48x48/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/48x48/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/64x64/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/64x64/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/72x72/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/72x72/status/qbittorrent-tray.png
--- a/dist/unix/menuicons/96x96/status/qbittorrent-tray.png
+++ b/dist/unix/menuicons/96x96/status/qbittorrent-tray.png
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@ -1711,7 +1711,7 @@ QIcon MainWindow::getSystrayIcon() const
				@@ -1711,7 +1711,7 @@ QIcon MainWindow::getSystrayIcon() const
    QIcon icon;
 #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
    if (Preferences::instance()->useSystemIconTheme())
-        icon = QIcon::fromTheme("qbittorrent");
+        icon = QIcon::fromTheme("qbittorrent-tray");

 #endif
    if (icon.isNull()) {