From 55479b01ff7bd5bec15ca6751daa9e555e866a1d Mon Sep 17 00:00:00 2001
From: Pierre Raybaut <pierre.raybaut@gmail.com>
Date: Wed, 19 Aug 2020 11:55:32 +0200
Subject: [PATCH] Fixed Qt scripts/launchers for pyqt5_tools 5.15

Fixed batch scripts (and exe launchers) for Qt Assistant, Designer and Linguist.
Requires pyqt5_tools 5.15.
---
 make.py | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/make.py b/make.py
index 31dd202e..91afb0a9 100644
--- a/make.py
+++ b/make.py
@@ -1066,6 +1066,15 @@ def _create_batch_scripts_initial(self):
 :pyqt5_conf_exist
 
 
+rem ******************
+rem handle pyqt5_tools if included
+rem ******************
+set tmp_pyz=%WINPYDIR%\Lib\site-packages\pyqt5_tools
+if not exist "%tmp_pyz%" goto end_pyqt5_tools_conf
+set QT_PLUGIN_PATH=%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\plugins
+:end_pyqt5_tools_conf
+
+
 rem ******************
 rem handle Pyzo configuration part
 rem ******************
@@ -1213,6 +1222,15 @@ def _create_batch_scripts_initial(self):
 }
 
 
+#####################
+### handle pyqt5_tools if included
+#####################
+$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\pyqt5_tools"
+if (Test-Path "$env:tmp_pyz") {
+   $env:QT_PLUGIN_PATH = "WINPYDIR\Lib\site-packages\pyqt5_tools\Qt\plugins"
+}
+
+
 #####################
 ### handle Pyzo configuration part
 #####################
@@ -1686,8 +1704,11 @@ def _create_batch_scripts(self):
             r"""@echo off
 call "%~dp0env_for_icons.bat"
 cd/D "%WINPYWORKDIR%"
+if "%QT_API%"=="" ( set QT_API=pyqt5 )
 if "%QT_API%"=="pyqt5" (
-    if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
+    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" %*
     ) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" (
         "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
@@ -1705,8 +1726,11 @@ def _create_batch_scripts(self):
             r"""@echo off
 call "%~dp0env_for_icons.bat"
 cd/D "%WINPYWORKDIR%"
+if "%QT_API%"=="" ( set QT_API=pyqt5 )
 if "%QT_API%"=="pyqt5" (
-    if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
+    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" %*
@@ -1724,8 +1748,11 @@ def _create_batch_scripts(self):
             r"""@echo off
 call "%~dp0env_for_icons.bat"
 cd/D "%WINPYWORKDIR%"
+if "%QT_API%"=="" ( set QT_API=pyqt5 )
 if "%QT_API%"=="pyqt5" (
-    if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
+    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" %*
     ) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" (
         "%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*