[vlc-devel] commit: Qt: compile extensions on Qt4.4 (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan 25 01:08:34 2010 +0100| [2551b9325ba114657ba71f5510564a8cc387a01b] | committer: Jean-Baptiste Kempf 

Qt: compile extensions on Qt4.4

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

 modules/gui/qt4/dialogs/extensions.cpp |    5 +++++
 modules/gui/qt4/qt4.hpp                |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/dialogs/extensions.cpp b/modules/gui/qt4/dialogs/extensions.cpp
index 5969e05..9f63846 100644
--- a/modules/gui/qt4/dialogs/extensions.cpp
+++ b/modules/gui/qt4/dialogs/extensions.cpp
@@ -175,8 +175,13 @@ ExtensionDialog::ExtensionDialog( intf_thread_t *_p_intf,
     assert( p_dialog );
 
     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 1dc7316..15f8a3a 100644
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -42,6 +42,8 @@
 # error Please update Qt version to 4.5.1. 4.5.0 is too buggy
 #endif
 
+#define HAS_QT45 ( QT_VERSION >= 0x040500 )
+
 enum {
     QT_NORMAL_MODE = 0,
     QT_ALWAYS_VIDEO_MODE,