Merge pull request #6397 from spycrab/qt_osx_icon

Qt/OSX: Fix icon

Source/Core/DolphinQt2/CMakeLists.txt

@@ -173,6 +173,10 @@ if(APPLE)
   target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/qt.conf")
   set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/qt.conf" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
+  # Copy icon into the bundle
+  target_sources(${DOLPHINQT2_BINARY} PRIVATE "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
+  set_source_files_properties("${CMAKE_SOURCE_DIR}/Data/Dolphin.icns" PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+
   # Copy Qt plugins into the bundle
   get_target_property(qtcocoa_location Qt5::QCocoaIntegrationPlugin LOCATION)
   target_sources(${DOLPHINQT2_BINARY} PRIVATE "${qtcocoa_location}")

Source/Core/DolphinQt2/Info.plist.in

@@ -28,7 +28,7 @@
     <key>CFBundleExecutable</key>
     <string>dolphin-emu-qt2</string>
     <key>CFBundleIconFile</key>
-    <string>Resources/Dolphin.icns</string>
+    <string>Dolphin.icns</string>
     <key>CFBundleIdentifier</key>
     <string>org.dolphin-emu.dolphin</string>
     <key>CFBundleDevelopmentRegion</key>

Source/Core/DolphinWX/CMakeLists.txt

@@ -93,7 +93,7 @@ set(LIBS
 
 if(APPLE)
   # Add resource files to application bundle.
-  set(RESOURCES resources/Dolphin.icns)
+  set(RESOURCES "${CMAKE_SOURCE_DIR}/Data/Dolphin.icns")
   list(APPEND SRCS ${RESOURCES})
   set_source_files_properties(${RESOURCES} PROPERTIES
     MACOSX_PACKAGE_LOCATION Resources)