From a5f79a7d285b162d40e0289bc9ad733ec4da606e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Thu, 14 May 2009 19:34:36 +0200 Subject: [PATCH] Bump necessary Qt version to 4.4 --- configure.ac | 4 ++-- modules/gui/qt4/qt4.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 75992a1211..c7533a9213 100644 --- 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 dbcd04f7aa..6bde271569 100644 --- a/modules/gui/qt4/qt4.hpp +++ b/modules/gui/qt4/qt4.hpp @@ -36,7 +36,7 @@ #include #include -#if ( QT_VERSION < 0x040300 ) +#if ( QT_VERSION < 0x040400 ) # error Update your Qt version #endif #if QT_VERSION == 0x040500