macOS App Icon fix

• Apple UI guidelines adherent Finder icon and Dock icon • Delete now unnecessary Image.xcassets directory and its content • Required changes in Theengs.pro and main.cpp • New Icon with wider margins
theengs · Jun 20, 2022 · 1e438b5 · 1e438b5
1 parent 45f28e1
commit 1e438b5
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 4 deletions.
diff --git a/Theengs.pro b/Theengs.pro
@@ -267,8 +267,7 @@ macx {
     QMAKE_BUNDLE = app
 
     # OS
-    QMAKE_ASSET_CATALOGS_APP_ICON = "AppIcon"
-    QMAKE_ASSET_CATALOGS = $${PWD}/assets/macos/Images.xcassets
+    ICON = $${PWD}/assets/macos/theengs.icns
 
     # OS infos
     QMAKE_INFO_PLIST = $${PWD}/assets/macos/Info.plist

diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/1024.png b/assets/macos/Image.xcassets/AppIcon.appiconset/1024.png
diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/128.png b/assets/macos/Image.xcassets/AppIcon.appiconset/128.png
diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/16.png b/assets/macos/Image.xcassets/AppIcon.appiconset/16.png
diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/256.png b/assets/macos/Image.xcassets/AppIcon.appiconset/256.png
diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/32.png b/assets/macos/Image.xcassets/AppIcon.appiconset/32.png
diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/512.png b/assets/macos/Image.xcassets/AppIcon.appiconset/512.png
diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/64.png b/assets/macos/Image.xcassets/AppIcon.appiconset/64.png
diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/Contents.json b/assets/macos/Image.xcassets/AppIcon.appiconset/Contents.json
diff --git a/assets/macos/theengs.icns b/assets/macos/theengs.icns
diff --git a/src/main.cpp b/src/main.cpp
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
     app.setOrganizationName("Theengs");
     app.setOrganizationDomain("Theengs");
 
-#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS)
+#if !defined(Q_OS_ANDROID) && !defined(Q_OS_IOS) && !defined(Q_OS_MACOS)
     // Application icon
     QIcon appIcon(":/assets/logos/logo.png");
     app.setWindowIcon(appIcon);