[vlc-devel] commit: Qt4: Warn about Qt version 4.5.0 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri May  1 16:16:00 2009 +0200| [ea8e32872f5bbb31905450d8a9ebc2ebe037cafe] | committer: Jean-Baptiste Kempf 

Qt4: Warn about Qt version 4.5.0

This version is quite broken...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea8e32872f5bbb31905450d8a9ebc2ebe037cafe
---

 modules/gui/qt4/menus.cpp |    7 -------
 modules/gui/qt4/qt4.hpp   |    3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 04ba848..948fcee 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1408,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() )
         {
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index b764a9c..941632a 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -39,6 +39,9 @@
 #if ( QT_VERSION < 0x040300 )
 # error Update your Qt version
 #endif
+#if QT_VERSION == 0x040500
+# warning Please update Qt version to 4.5.1. This warning will become an error.
+#endif
 
 enum {
     QT_NORMAL_MODE = 0,