[vlc-commits] Qt4: remove Qt versions 4.3-4.5 specific code

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Sep 28 13:12:32 2011 +0300| [79b4dbf387bce007d9a3daf6a811bd05478d005e] | committer: Rémi Denis-Courmont

Qt4: remove Qt versions 4.3-4.5 specific code

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

 modules/gui/qt4/components/open_panels.cpp |    2 --
 modules/gui/qt4/dialogs/extensions.cpp     |    5 -----
 modules/gui/qt4/qt4.hpp                    |    8 ++------
 modules/gui/qt4/util/pictureflow.cpp       |    5 -----
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 8c3b50b..d74bdec 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -592,9 +592,7 @@ NetOpenPanel::~NetOpenPanel()
         mrlList << ui.urlComboBox->itemText( i );
 
     /* Clean the list... */
-#if HAS_QT45
     mrlList.removeDuplicates();
-#endif
     /* ...and save the 8 last entries */
     getSettings()->setValue( "Open/netMRL", mrlList );
 }
diff --git a/modules/gui/qt4/dialogs/extensions.cpp b/modules/gui/qt4/dialogs/extensions.cpp
index e639c0d..ea82bdb 100644
--- a/modules/gui/qt4/dialogs/extensions.cpp
+++ b/modules/gui/qt4/dialogs/extensions.cpp
@@ -186,13 +186,8 @@ ExtensionDialog::ExtensionDialog( intf_thread_t *_p_intf,
              this, parentDestroyed() );
 
     msg_Dbg( p_intf, "Creating a new dialog: '%s'", p_dialog->psz_title );
-#if HAS_QT45
     this->setWindowFlags( Qt::WindowMinMaxButtonsHint
                         | Qt::WindowCloseButtonHint );
-#else
-    this->setWindowFlags( Qt::WindowMinMaxButtonsHint );
-#endif
-
     this->setWindowTitle( qfu( p_dialog->psz_title ) );
 
     layout = new QGridLayout( this );
diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index 495468e..6d0ce5f 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -36,14 +36,10 @@
 #define QT_NO_CAST_TO_ASCII
 #include <QString>
 
-#if ( QT_VERSION < 0x040400 )
-# error Update your Qt version to at least 4.4.0
-#endif
-#if QT_VERSION == 0x040500
-# error Please update Qt version to 4.5.1. 4.5.0 is too buggy
+#if ( QT_VERSION < 0x040600 )
+# error Update your Qt version to at least 4.6.0
 #endif
 
-#define HAS_QT45 ( QT_VERSION >= 0x040500 )
 #define HAS_QT47 ( QT_VERSION >= 0x040700 )
 
 enum {
diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp
index fc22981..7e946fb 100644
--- a/modules/gui/qt4/util/pictureflow.cpp
+++ b/modules/gui/qt4/util/pictureflow.cpp
@@ -28,11 +28,6 @@
 #include "pictureflow.hpp"
 #include "components/playlist/ml_model.hpp"
 
-// detect Qt version
-#if QT_VERSION < 0x040300
-#error PictureFlow widgets need Qt 4.3 or later
-#endif
-
 #include <QApplication>
 #include <QImage>
 #include <QKeyEvent>