Bump necessary Qt version to 4.4

diff --git a/configure.ac b/configure.ac
index 75992a1211daae8d4254c759e43c7e193df63dbb..c7533a9213276b9f5932d82a8ae60c3fd9f4a07b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4941,7 +4941,7 @@ then
     VLC_ADD_LIBS([maemo],[${HILDON_LIBS}])
     VLC_ADD_PLUGIN([maemo])
     VLC_ADD_PLUGIN([swscale_maemo])
-    AC_DEFINE([BUILD_MAEMO], 1, [Define if you're using Maemo interfaces])
+    AC_DEFINE([BUILD_MAEMO], 1, [Define if you are using Maemo interfaces])
     ALIASES="${ALIASES} mvlc"
   ], [
     AS_IF([test "${enable_maemo}" = "yes"],[
@@ -4960,7 +4960,7 @@ AC_ARG_ENABLE(qt4,
   AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
 ])
 AS_IF([test "${enable_qt4}" != "no"], [
-  PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.3.0], [
+  PKG_CHECK_MODULES(QT4, [QtCore QtGui >= 4.4.2], [
     VLC_ADD_PLUGIN([qt4])
     AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
     ALIASES="${ALIASES} qvlc"

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index dbcd04f7aa47f8a311e575d1f298b0ad6a9c43e4..6bde27156959e2756d58fe83ba01014ac090cabe 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -36,7 +36,7 @@
 #include <QEvent>
 #include <QString>
 
-#if ( QT_VERSION < 0x040300 )
+#if ( QT_VERSION < 0x040400 )
 # error Update your Qt version
 #endif
 #if QT_VERSION == 0x040500