qt4: metaChanged -> currentMetaChanged

[vlc] / modules / gui / qt4 / menus.cpp

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 020bab45dfd780ebed138e27b5ef3775310c2d6a..948fcee36168ce71f06147c14cc69165ee5a2656 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1253,6 +1253,8 @@ void QVLCMenu::UpdateItem( intf_thread_t *p_intf, QMenu *menu,
     FREENULL( text.psz_string );
 }
 
+#undef TEXT_OR_VAR
+
 
 int QVLCMenu::CreateChoicesMenu( QMenu *submenu, const char *psz_var,
         vlc_object_t *p_object, bool b_root )
@@ -1406,14 +1408,7 @@ void QVLCMenu::updateRecents( intf_thread_t *p_intf )
         RecentsMRL* rmrl = RecentsMRL::getInstance( p_intf );
         QList<QString> l = rmrl->recents();
 
-#if QT_VERSION == 0x040500
-        //Workaround for Qt bug #176201
-        QList<QAction*> actions = recentsMenu->actions();
-        for(int i = 0; i < actions.size(); ++i)
-            actions.at(i)->deleteLater();
-#else
         recentsMenu->clear();
-#endif
 
         if( !l.size() )
         {