From 094eebb87f30f7021ebfff72b80e6ef9fd1f3c7e Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Mon, 16 Dec 2024 15:48:41 +0100 Subject: [PATCH] qt: fix bitfield added values set in QVariant It's checked with actions[i]->data().toInt() anyway. The code was removed in 4.0 with e1c82853965d44b4390af78d9184bd0b60ccc3fb but was never fixed. Gbp-Pq: Name 0117-qt-fix-bitfield-added-values-set-in-QVariant.patch --- modules/gui/qt/menus.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp index 460653c9..70a475fb 100644 --- a/modules/gui/qt/menus.cpp +++ b/modules/gui/qt/menus.cpp @@ -846,20 +846,20 @@ void VLCMenuBar::PopupMenuPlaylistEntries( QMenu *menu, action = addMIMStaticEntry( p_intf, menu, qtr( "Pre&vious" ), ":/toolbar/previous_b.svg", SLOT( prev() ), true ); action->setEnabled( !bPlaylistEmpty ); - action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + action->setData( static_cast(ACTION_NO_CLEANUP | ACTION_DELETE_ON_REBUILD) ); CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) ); action = addMIMStaticEntry( p_intf, menu, qtr( "Ne&xt" ), ":/toolbar/next_b.svg", SLOT( next() ), true ); action->setEnabled( !bPlaylistEmpty ); - action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + action->setData( static_cast(ACTION_NO_CLEANUP | ACTION_DELETE_ON_REBUILD) ); CONNECT( THEMIM, playlistNotEmpty(bool), action, setEnabled(bool) ); action = menu->addAction( qtr( "Record" ), THEAM, SLOT( record() ) ); action->setIcon( QIcon( ":/toolbar/record.svg" ) ); if( !p_input ) action->setEnabled( false ); - action->setData( ACTION_NO_CLEANUP + ACTION_DELETE_ON_REBUILD ); + action->setData( static_cast(ACTION_NO_CLEANUP | ACTION_DELETE_ON_REBUILD) ); menu->addSeparator(); } -- 2.30.2