Commit a5f79a7d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Bump necessary Qt version to 4.4

parent fd7f8f85
...@@ -4941,7 +4941,7 @@ then ...@@ -4941,7 +4941,7 @@ then
VLC_ADD_LIBS([maemo],[${HILDON_LIBS}]) VLC_ADD_LIBS([maemo],[${HILDON_LIBS}])
VLC_ADD_PLUGIN([maemo]) VLC_ADD_PLUGIN([maemo])
VLC_ADD_PLUGIN([swscale_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" ALIASES="${ALIASES} mvlc"
], [ ], [
AS_IF([test "${enable_maemo}" = "yes"],[ AS_IF([test "${enable_maemo}" = "yes"],[
...@@ -4960,7 +4960,7 @@ AC_ARG_ENABLE(qt4, ...@@ -4960,7 +4960,7 @@ AC_ARG_ENABLE(qt4,
AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no]) AS_IF([test "${SYS}" = "darwin"], [enable_qt4=no])
]) ])
AS_IF([test "${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]) VLC_ADD_PLUGIN([qt4])
AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.]) AC_DEFINE([HAVE_QT4], 1, [Define to 1 if you have QT4 library.])
ALIASES="${ALIASES} qvlc" ALIASES="${ALIASES} qvlc"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <QEvent> #include <QEvent>
#include <QString> #include <QString>
#if ( QT_VERSION < 0x040300 ) #if ( QT_VERSION < 0x040400 )
# error Update your Qt version # error Update your Qt version
#endif #endif
#if QT_VERSION == 0x040500 #if QT_VERSION == 0x040500
......
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