From 2713078b25e9da04ba665569c559cc9b0be5542b Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Mon, 17 Jun 2019 19:32:37 -0300
Subject: [PATCH] Tools: Prefer using Qt5 translation tools over Qt4

---
 src/Tools/updatets.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py
index 40182649934e..5f5433228336 100755
--- a/src/Tools/updatets.py
+++ b/src/Tools/updatets.py
@@ -125,10 +125,10 @@ def find_tools(noobsolete=True):
     global QMAKE, LUPDATE, PYLUPDATE, LCONVERT
     if (os.system("qmake -version") == 0):
         QMAKE = "qmake"
-    elif (os.system("qmake-qt4 -version") == 0):
-        QMAKE = "qmake-qt4"
     elif (os.system("qmake-qt5 -version") == 0):
         QMAKE = "qmake-qt5"
+    elif (os.system("qmake-qt4 -version") == 0):
+        QMAKE = "qmake-qt4"
     else:
         raise Exception("Cannot find qmake")
     if (os.system("lupdate -version") == 0):
@@ -136,26 +136,26 @@ def find_tools(noobsolete=True):
         # TODO: we suppose lupdate is a symlink to lupdate-qt4 for now
         if noobsolete:
             LUPDATE += " -no-obsolete"
-    elif (os.system("lupdate-qt4 -version") == 0):
-        LUPDATE = "lupdate-qt4"
-        if noobsolete:
-            LUPDATE += " -no-obsolete"
     elif (os.system("lupdate-qt5 -version") == 0):
         LUPDATE = "lupdate-qt5"
+        if noobsolete:
+            LUPDATE += " -no-obsolete"
+    elif (os.system("lupdate-qt4 -version") == 0):
+        LUPDATE = "lupdate-qt4"
         if noobsolete:
             LUPDATE += " -noobsolete"
     else:
         raise Exception("Cannot find lupdate")
     if (os.system("pylupdate -version") == 0):
         PYLUPDATE = "pylupdate"
-    elif (os.system("pylupdate4 -version") == 0):
-        PYLUPDATE = "pylupdate4"
-        if noobsolete:
-            PYLUPDATE += " -noobsolete"
     elif (os.system("pylupdate5 -version") == 0):
         PYLUPDATE = "pylupdate5"
         if noobsolete:
             PYLUPDATE += " -noobsolete"
+    elif (os.system("pylupdate4 -version") == 0):
+        PYLUPDATE = "pylupdate4"
+        if noobsolete:
+            PYLUPDATE += " -noobsolete"
     else:
         raise Exception("Cannot find pylupdate")
     if (os.system("lconvert -h") == 0):