Try to use qmake-qt4 in preference to qmake-qt5

MythTV · Mar 4, 2015 · f1115fc · f1115fc
1 parent 6b550fc
commit f1115fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/mythplugins/configure b/mythplugins/configure
@@ -561,14 +561,14 @@ OPENGLV=$(cat mythconfig.mak | grep -e "^CONFIG_OPENGL_VIDEO=yes")
 EXTRALIBS=$(cat mythconfig.mak | grep -e "^EXTRALIBS=")
 EXTRALIBS=${EXTRALIBS#EXTRALIBS=}
 
-if is_qmake5 $qmake || is_qmake5 qmake-qt5; then
-    if is_qmake5 qmake-qt5; then
-        qmake=qmake-qt5
-    fi
-elif is_qmake4 $qmake || is_qmake4 qmake-qt4; then
+if is_qmake4 $qmake || is_qmake4 qmake-qt4; then
     if is_qmake4 qmake-qt4; then
         qmake=qmake-qt4
     fi
+elif is_qmake5 $qmake || is_qmake5 qmake-qt5; then
+    if is_qmake5 qmake-qt5; then
+        qmake=qmake-qt5
+    fi
 else
     die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake="
 fi

diff --git a/mythtv/configure b/mythtv/configure
@@ -4468,15 +4468,15 @@ is_qmake4(){
     $1 --version 2>&1 | egrep -q -e "Qt version 4\.[8-9]\.[0-9]"
 }
 
-if is_qmake5 $qmake || is_qmake5 qmake-qt5; then
+if is_qmake4 $qmake || is_qmake4 qmake-qt4; then
+    if is_qmake4 qmake-qt4; then
+        qmake=qmake-qt4
+    fi
+elif is_qmake5 $qmake || is_qmake5 qmake-qt5; then
     if is_qmake5 qmake-qt5; then
         qmake=qmake-qt5
     fi
     check_cxxflags -DQT_DISABLE_DEPRECATED_BEFORE
-elif is_qmake4 $qmake || is_qmake4 qmake-qt4; then
-    if is_qmake4 qmake-qt4; then
-        qmake=qmake-qt4
-    fi
 else
     die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake="
 fi