Qt4: Warn about Qt version 4.5.0

This version is quite broken...

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 04ba8481f0eb6aec3d00871d4e2d91a2ce95416b..948fcee36168ce71f06147c14cc69165ee5a2656 100644 (file)
--- 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 b764a9c4f3ef4afd2b548e1c5bb9b9a4e15c31a8..941632a3d0ef64104d4ddb0d8af55348c8689719 100644 (file)
--- 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,