From ea8e32872f5bbb31905450d8a9ebc2ebe037cafe Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Fri, 1 May 2009 16:16:00 +0200 Subject: [PATCH] Qt4: Warn about Qt version 4.5.0 This version is quite broken... --- 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 04ba8481f0..948fcee361 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 l = rmrl->recents(); -#if QT_VERSION == 0x040500 - //Workaround for Qt bug #176201 - QList 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 b764a9c4f3..941632a3d0 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, -- 2.39.2