diff --git a/Theengs.pro b/Theengs.pro index 161f9fa..1ac14f6 100644 --- 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 deleted file mode 100644 index aa0f73f..0000000 Binary files a/assets/macos/Image.xcassets/AppIcon.appiconset/1024.png and /dev/null differ diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/128.png b/assets/macos/Image.xcassets/AppIcon.appiconset/128.png deleted file mode 100644 index 454cc4d..0000000 Binary files a/assets/macos/Image.xcassets/AppIcon.appiconset/128.png and /dev/null differ diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/16.png b/assets/macos/Image.xcassets/AppIcon.appiconset/16.png deleted file mode 100644 index 18340a2..0000000 Binary files a/assets/macos/Image.xcassets/AppIcon.appiconset/16.png and /dev/null differ diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/256.png b/assets/macos/Image.xcassets/AppIcon.appiconset/256.png deleted file mode 100644 index 15a901c..0000000 Binary files a/assets/macos/Image.xcassets/AppIcon.appiconset/256.png and /dev/null differ diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/32.png b/assets/macos/Image.xcassets/AppIcon.appiconset/32.png deleted file mode 100644 index cc3fa2b..0000000 Binary files a/assets/macos/Image.xcassets/AppIcon.appiconset/32.png and /dev/null differ diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/512.png b/assets/macos/Image.xcassets/AppIcon.appiconset/512.png deleted file mode 100644 index ef8b24b..0000000 Binary files a/assets/macos/Image.xcassets/AppIcon.appiconset/512.png and /dev/null differ diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/64.png b/assets/macos/Image.xcassets/AppIcon.appiconset/64.png deleted file mode 100644 index 8819544..0000000 Binary files a/assets/macos/Image.xcassets/AppIcon.appiconset/64.png and /dev/null differ diff --git a/assets/macos/Image.xcassets/AppIcon.appiconset/Contents.json b/assets/macos/Image.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 2003d5b..0000000 --- a/assets/macos/Image.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1 +0,0 @@ -{"images":[{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} \ No newline at end of file diff --git a/assets/macos/theengs.icns b/assets/macos/theengs.icns index 73e291c..936bf7b 100644 Binary files a/assets/macos/theengs.icns and b/assets/macos/theengs.icns differ diff --git a/src/main.cpp b/src/main.cpp index 6411243..d7be0c0 100644 --- 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);