eden-emu/eden
24
3
Fork 16
Code Issues 139 Pull requests 56 Projects 1 Releases Wiki Activity Actions

[qt_common] fix building with Qt 6.10 #2713

Merged
crueter merged 2 commits from marcin-serwin/eden:push-kkvsovqulotm into master 2025-10-10 22:33:16 +02:00
Conversation 2 Commits 2 Files changed 2 +6 -10
marcin-serwin commented 2025-10-10 22:11:38 +02:00
Member
Copy link

Qt old style include variables are deprecated in Qt, see https://github.com/qt/qtbase/blob/v6.10.0/cmake/QtModuleConfig.cmake.in#L84, and Qt 6.10 stopped exporting them after https://github.com/qt/qtbase/commit/ad7b94e163ac5c3959a7e38d7f48536be288a187.

Signed-off-by: Marcin Serwin marcin@serwin.dev

Qt old style include variables are deprecated in Qt, see <https://github.com/qt/qtbase/blob/v6.10.0/cmake/QtModuleConfig.cmake.in#L84>, and Qt 6.10 stopped exporting them after <https://github.com/qt/qtbase/commit/ad7b94e163ac5c3959a7e38d7f48536be288a187>. Signed-off-by: Marcin Serwin <marcin@serwin.dev>
qt_common: fix building with Qt 6.10
All checks were successful
eden-license / license-header (pull_request) Successful in 28s
Details
c6d4785711
 
Qt old style include variables are deprecated in Qt, see
<https://github.com/qt/qtbase/blob/v6.10.0/cmake/QtModuleConfig.cmake.in#L84>,
and Qt 6.10 stopped exporting them after
<ad7b94e163>.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
marcin-serwin changed title from qt_common: fix building with Qt 6.10 to [qt_common] fix building with Qt 6.10 2025-10-10 22:13:16 +02:00
crueter commented 2025-10-10 22:16:43 +02:00
Owner
Copy link

It's probably better to do what the yuzu target does and only link to GuiPrivate if it exists, OR set the include dirs if they don't exist (helps with LTS distros on e.g. qt 6.4)

Also, while you're at it you can remove the GuiPrivate linkage from yuzu target entirely, qt_common only uses it in one file

It's probably better to do what the yuzu target does and only link to GuiPrivate if it exists, OR set the include dirs if they don't exist (helps with LTS distros on e.g. qt 6.4) Also, while you're at it you can remove the GuiPrivate linkage from yuzu target entirely, qt_common only uses it in one file
awesome
All checks were successful
eden-license / license-header (pull_request) Successful in 25s
Details
13c1ff6d48
 
Signed-off-by: crueter <crueter@eden-emu.dev>
marcin-serwin commented 2025-10-10 22:31:41 +02:00
Author
Member
Copy link

Makes sense. Your commit builds for me so LGTM.

Makes sense. Your commit builds for me so LGTM.
crueter merged commit 8a017951aa into master 2025-10-10 22:33:16 +02:00
crueter deleted branch push-kkvsovqulotm 2025-10-10 22:33:16 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
CamilleLaVey
Maufeat
MrPurple666
MaranBr
Lizzie
crueter
Labels
Clear labels   
android

Specific to android platform

  
audio

   
bug

Something is not working

  
ci

For changes to the ci/building

  
cmake

   
confirmed

Used when testers confirm a bug is reported and it is reproducable.

  
core

For core changes to the emulator

  
desktop

Specific to desktop PCs, handhelds, etc.

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
frontend

Frontend changes

  
fw

Changes related to firmware

  
git

For enhancements or changes regarding git.

  
graphics

   
loader

For changes to any of the loader implementations

  
nv gpu

For use with changes that involve the emulator GPU and any services.

  
ui

   
vulkan

Used on anything Vulkan-related

No labels
android
audio
bug
ci
cmake
confirmed
core
desktop
duplicate
enhancement
frontend
fw
git
graphics
loader
nv gpu
ui
vulkan
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
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
eden-emu/eden!2713
No description provided.