Tools: Prefer using Qt5 translation tools over Qt4

FreeCAD · Jun 17, 2019 · 2713078 · 2713078
1 parent d890b4e
commit 2713078
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py
@@ -125,37 +125,37 @@ 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):
         LUPDATE = "lupdate"
         # 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):