Commit 79b4dbf3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: remove Qt versions 4.3-4.5 specific code

parent af4dea1b
...@@ -592,9 +592,7 @@ NetOpenPanel::~NetOpenPanel() ...@@ -592,9 +592,7 @@ NetOpenPanel::~NetOpenPanel()
mrlList << ui.urlComboBox->itemText( i ); mrlList << ui.urlComboBox->itemText( i );
/* Clean the list... */ /* Clean the list... */
#if HAS_QT45
mrlList.removeDuplicates(); mrlList.removeDuplicates();
#endif
/* ...and save the 8 last entries */ /* ...and save the 8 last entries */
getSettings()->setValue( "Open/netMRL", mrlList ); getSettings()->setValue( "Open/netMRL", mrlList );
} }
......
...@@ -186,13 +186,8 @@ ExtensionDialog::ExtensionDialog( intf_thread_t *_p_intf, ...@@ -186,13 +186,8 @@ ExtensionDialog::ExtensionDialog( intf_thread_t *_p_intf,
this, parentDestroyed() ); this, parentDestroyed() );
msg_Dbg( p_intf, "Creating a new dialog: '%s'", p_dialog->psz_title ); msg_Dbg( p_intf, "Creating a new dialog: '%s'", p_dialog->psz_title );
#if HAS_QT45
this->setWindowFlags( Qt::WindowMinMaxButtonsHint this->setWindowFlags( Qt::WindowMinMaxButtonsHint
| Qt::WindowCloseButtonHint ); | Qt::WindowCloseButtonHint );
#else
this->setWindowFlags( Qt::WindowMinMaxButtonsHint );
#endif
this->setWindowTitle( qfu( p_dialog->psz_title ) ); this->setWindowTitle( qfu( p_dialog->psz_title ) );
layout = new QGridLayout( this ); layout = new QGridLayout( this );
......
...@@ -36,14 +36,10 @@ ...@@ -36,14 +36,10 @@
#define QT_NO_CAST_TO_ASCII #define QT_NO_CAST_TO_ASCII
#include <QString> #include <QString>
#if ( QT_VERSION < 0x040400 ) #if ( QT_VERSION < 0x040600 )
# error Update your Qt version to at least 4.4.0 # error Update your Qt version to at least 4.6.0
#endif
#if QT_VERSION == 0x040500
# error Please update Qt version to 4.5.1. 4.5.0 is too buggy
#endif #endif
#define HAS_QT45 ( QT_VERSION >= 0x040500 )
#define HAS_QT47 ( QT_VERSION >= 0x040700 ) #define HAS_QT47 ( QT_VERSION >= 0x040700 )
enum { enum {
......
...@@ -28,11 +28,6 @@ ...@@ -28,11 +28,6 @@
#include "pictureflow.hpp" #include "pictureflow.hpp"
#include "components/playlist/ml_model.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 <QApplication>
#include <QImage> #include <QImage>
#include <QKeyEvent> #include <QKeyEvent>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment