[PR #2780] [MERGED] misc: Few small fixes. #2972

Closed
opened 2026-02-27 22:01:58 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/shadps4-emu/shadPS4/pull/2780
Author: @squidbus
Created: 4/13/2025
Status: Merged
Merged: 4/13/2025
Merged by: @squidbus

Base: mainHead: fixes


📝 Commits (2)

  • 35db6fc qt: Use PNG file for logo.
  • a470fbb build: Fix some CMake issues.

📊 Changes

6 files changed (+9 additions, -10 deletions)

View changed files

📝 CMakeLists.txt (+5 -7)
📝 REUSE.toml (+1 -0)
src/images/shadps4.png (+0 -0)
📝 src/qt_gui/about_dialog.ui (+1 -1)
📝 src/qt_gui/check_update.cpp (+1 -1)
📝 src/shadps4.qrc (+1 -1)

📄 Description

  • Use PNG for logo in Qt UI, as it seems SVG is not supported by default. Worked on my local but does not work from CI builds.
  • Fix some CMake issues:
    • CMAKE_OSX_DEPLOYMENT_TARGET is recommended to be set as a cache variable.
    • Avoid adding to CMAKE_MODULE_PATH as it can cause conflicts with submodules; for example, there is an error currently because of a conflict between the shadPS4 and SDL3 scripts for finding libusb.

Tested the PNG change in CI to make sure the logo is working there this time.


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/shadps4-emu/shadPS4/pull/2780 **Author:** [@squidbus](https://github.com/squidbus) **Created:** 4/13/2025 **Status:** ✅ Merged **Merged:** 4/13/2025 **Merged by:** [@squidbus](https://github.com/squidbus) **Base:** `main` ← **Head:** `fixes` --- ### 📝 Commits (2) - [`35db6fc`](https://github.com/shadps4-emu/shadPS4/commit/35db6fc4c63bef63f5a655dc67f95af39f39cd01) qt: Use PNG file for logo. - [`a470fbb`](https://github.com/shadps4-emu/shadPS4/commit/a470fbb787874a4bd08388e78e3e1cea86fc058d) build: Fix some CMake issues. ### 📊 Changes **6 files changed** (+9 additions, -10 deletions) <details> <summary>View changed files</summary> 📝 `CMakeLists.txt` (+5 -7) 📝 `REUSE.toml` (+1 -0) ➕ `src/images/shadps4.png` (+0 -0) 📝 `src/qt_gui/about_dialog.ui` (+1 -1) 📝 `src/qt_gui/check_update.cpp` (+1 -1) 📝 `src/shadps4.qrc` (+1 -1) </details> ### 📄 Description * Use PNG for logo in Qt UI, as it seems SVG is not supported by default. Worked on my local but does not work from CI builds. * Fix some CMake issues: * `CMAKE_OSX_DEPLOYMENT_TARGET` is recommended to be set as a cache variable. * Avoid adding to `CMAKE_MODULE_PATH` as it can cause conflicts with submodules; for example, there is an error currently because of a conflict between the shadPS4 and SDL3 scripts for finding libusb. Tested the PNG change in CI to make sure the logo is working there this time. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-02-27 22:01:58 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/shadPS4#2972
No description provided.