Merge branch 'develop' into feature/allow-disable-app-bundle

2017-05-14 22:58:17 +08:00
parent 3822625e77 00ae123736
commit c53f5baceb
21 changed files with 201 additions and 25 deletions
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@@ -101,7 +101,7 @@ QIcon FilePath::trayIconLocked()

 QIcon FilePath::trayIconUnlocked()
 {
-    return applicationIcon();
+    return icon("apps", "keepassxc-unlocked");
 }

 QIcon FilePath::icon(const QString& category, const QString& name, bool fromTheme)