ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix qt6 dispatcher

This commit is contained in:
Viačasłaŭ Chalikin 2025-04-16 15:32:57 +03:00
parent 203fff1a11
commit 1736184f15
No known key found for this signature in database
GPG Key ID: 7569457AA0318285
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qb/config.libs.sh
View File

@ -313,6 +313,7 @@ if [ "$HAVE_QT" != 'no' ]; then
then then
HAVE_QT6='yes' HAVE_QT6='yes'
add_define MAKEFILE HAVE_QT6 1 add_define MAKEFILE HAVE_QT6 1
add_define CONFIG HAVE_QT6 1
fi fi
fi fi
if [ "$HAVE_QT6" != 'yes' ]; then if [ "$HAVE_QT6" != 'yes' ]; then

4
ui/ui_companion_driver.c
View File

@ -140,7 +140,11 @@ void ui_companion_driver_init_first(
{ {
uico_driver_state_t *uico_st = &uico_driver_st; uico_driver_state_t *uico_st = &uico_driver_st;
#ifdef HAVE_QT #ifdef HAVE_QT
#ifdef HAVE_QT6 /* FIXME: deferred initialization after loading/unloading content */
if (desktop_menu_enable)
#else
if (desktop_menu_enable && ui_companion_toggle) if (desktop_menu_enable && ui_companion_toggle)
#endif
{ {
uico_st->qt_data = ui_companion_qt.init(); uico_st->qt_data = ui_companion_qt.init();
uico_st->flags |= UICO_ST_FLAG_QT_IS_INITED; uico_st->flags |= UICO_ST_FLAG_QT_IS_INITED;