Merge pull request #662 from IJHack/new-macos-logo

new macOS icon by @ivan-avalos
IJHack · Sep 27, 2023 · f25b8ea · f25b8ea
2 parents 2d9a87e + c39926b
commit f25b8ea
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,7 @@
 
 **Fixed bugs:**
 
-- Update website to reflect new brew command syntax [\#601](https://github.com/IJHack/QtPass/issues/601)
+- Update site to reflect new brew command syntax [\#601](https://github.com/IJHack/QtPass/issues/601)
 - Qtpass - not asking for password [\#585](https://github.com/IJHack/QtPass/issues/585)
 - Missing menu [\#574](https://github.com/IJHack/QtPass/issues/574)
 

diff --git a/artwork/icon.icns b/artwork/icon.icns
diff --git a/main/main.cpp b/main/main.cpp
@@ -94,7 +94,10 @@ int main(int argc, char *argv[]) {
   MainWindow w(text);
 
   SingleApplication::setActiveWindow(&w);
+
+#ifndef Q_OS_OSX
   SingleApplication::setWindowIcon(QIcon(":artwork/icon.png"));
+#endif
 
 #if SINGLE_APP
   QObject::connect(&app, &SingleApplication::messageAvailable, &w,