Merge pull request winpython#948 from mcmetrox/fix/pyqt5-bin-paths

stonebig · web-flow · commit f7e4eed9d6d8 · 2021-04-04T11:33:41.000+02:00
Add aditional path to check for qt binaries
diff --git a/make.py b/make.py
@@ -1763,6 +1763,8 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     if exist "%WINPYDIR%\Scripts\designer.exe" (
         "%WINPYDIR%\Scripts\designer.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\designer.exe" (
+        "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\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" (
@@ -1787,6 +1789,8 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     if exist "%WINPYDIR%\Scripts\assistant.exe" (
         "%WINPYDIR%\Scripts\assistant.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\assistant.exe" (
+        "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\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" (
@@ -1811,6 +1815,8 @@ def _create_batch_scripts(self):
 if "%QT_API%"=="pyqt5" (
     if exist "%WINPYDIR%\Scripts\linguist.exe" (
         "%WINPYDIR%\Scripts\linguist.exe" %*
+    ) else if exist "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\linguist.exe" (
+        "%WINPYDIR%\Lib\site-packages\qt5_applications\Qt\bin\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" (
