Fixed Qt scripts/launchers for pyqt5_tools 5.15.0.1.7.1

PierreRaybaut · web-flow · commit adfb55e07029 · 2020-09-09T16:25:36.000+02:00
diff --git a/make.py b/make.py
@@ -1706,7 +1706,9 @@ def _create_batch_scripts(self):
 cd/D "%WINPYWORKDIR%"
 if "%QT_API%"=="" ( set QT_API=pyqt5 )
 if "%QT_API%"=="pyqt5" (
-    if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" (
+    if exist "%WINPYDIR%\Scripts\designer.exe" (
+        "%WINPYDIR%\Scripts\designer.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" %*
     ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
@@ -1728,17 +1730,19 @@ def _create_batch_scripts(self):
 cd/D "%WINPYWORKDIR%"
 if "%QT_API%"=="" ( set QT_API=pyqt5 )
 if "%QT_API%"=="pyqt5" (
-    if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" (
+    if exist "%WINPYDIR%\Scripts\assistant.exe" (
+        "%WINPYDIR%\Scripts\assistant.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" %*
     ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
     ) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" (
         "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
     ) else (
-        "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
+        "%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
     )
 ) else (
-    "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
+    "%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
 )
 """,
         )
@@ -1750,7 +1754,9 @@ def _create_batch_scripts(self):
 cd/D "%WINPYWORKDIR%"
 if "%QT_API%"=="" ( set QT_API=pyqt5 )
 if "%QT_API%"=="pyqt5" (
-    if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" (
+    if exist "%WINPYDIR%\Scripts\linguist.exe" (
+        "%WINPYDIR%\Scripts\linguist.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" %*
     ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" %*
