summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Morgan <smorgan@mythtv.org>2012-11-27 16:56:40 (GMT)
committer Stuart Morgan <smorgan@mythtv.org>2012-11-27 16:56:50 (GMT)
commit9d670e8f4a46cd18d7a52352141f99e8dd380157 (patch)
treea7cbd66a5eb61d5a07de88f8ca59fb59b9f963c2
parent4f98a092c6a4ed561040a92ee5c488d5f368a816 (diff)
Have configure check for QT 4.8 as a minimum
-rwxr-xr-xmythtv/configure8
1 files changed, 4 insertions, 4 deletions
diff --git a/mythtv/configure b/mythtv/configure
index 7b7b02e..57c98f3 100755
--- a/mythtv/configure
+++ b/mythtv/configure
@@ -3678,15 +3678,15 @@ is_qmake5(){
}
is_qmake4(){
- $1 --version 2>&1 | egrep -q -e "Qt version 4\.[0-9]\.[0-9]"
+ $1 --version 2>&1 | egrep -q -e "Qt version 4\.[8-9]\.[0-9]"
}
if ! is_qmake5 $qmake ; then
if ! is_qmake4 $qmake; then
- is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.6 or newer not found.\nPlease specify the correct qmake with --qmake="
+ is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake="
fi
- if ! expr $($qmake -query QT_VERSION) : "4\.[6-9]\.[0-9]" >/dev/null; then
- die "Qt4.6 or newer is required to build MythTV."
+ if ! expr $($qmake -query QT_VERSION) : "4\.[8-9]\.[0-9]" >/dev/null; then
+ die "Qt4.8 or newer is required to build MythTV."
fi
else
check_cxxflags -DHAVE_QT5