Merge 0.8.3 upstream

This commit is contained in:
Yuriy Puchkov
2020-10-02 10:13:04 +03:00
37 changed files with 1293 additions and 1550 deletions

View File

@@ -277,7 +277,7 @@ void Controller::sendTrayNotification(const QString& text,
{
if (m_trayIcon) {
m_trayIcon->showMessage(
title, text, QSystemTrayIcon::Information, timeout);
title, text, QIcon(":img/app/flameshot.svg"), timeout);
}
}