Merge pull request winpython#679 from geissbuehler/pyqt5_tools

stonebig · web-flow · commit dcff3681ff94 · 2018-10-28T18:44:39.000+01:00
Ensure compatibility with pyqt5-tools &gt; 5.9.0
diff --git a/make.py b/make.py
@@ -1166,6 +1166,8 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\designer.exe" (
+        "%WINPYDIR%\Lib\site-packages\pyqt5_tools\designer.exe" %*
     ) else (
         "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
     )
@@ -1182,6 +1184,8 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     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_tools\assistant.exe" (
+        "%WINPYDIR%\Lib\site-packages\pyqt5_tools\assistant.exe" %*
     ) else (
         "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
     )
@@ -1196,6 +1200,8 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" (
+        "%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*
     ) else (
         cd/D "%WINPYDIR%\Lib\site-packages\PyQt5"
         "%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" %*
