Skip to content

Commit 4c5f5cf

Browse files
author
stonebig
committed
pyqt5-tools compatibility
1 parent 9c2ab29 commit 4c5f5cf

1 file changed

Lines changed: 17 additions & 6 deletions

File tree

‎make.py‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,18 +1026,22 @@ def _create_batch_scripts(self):
10261026
call "%~dp0env_for_icons.bat"
10271027
cd/D "%WINPYWORKDIR%"
10281028
if exist "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py" (
1029-
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py"
1029+
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\PyQt5\examples\qtdemo\qtdemo.py"
10301030
)
10311031
if exist "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw" (
1032-
"%WINPYDIR%\pythonw.exe" "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw"
1032+
"%WINPYDIR%\pythonw.exe" "%WINPYDIR%\Lib\site-packages\PyQt4\examples\demos\qtdemo\qtdemo.pyw"
10331033
)
10341034
""")
10351035

10361036
self.create_batch_script('qtdesigner.bat',r"""@echo off
10371037
call "%~dp0env_for_icons.bat"
10381038
cd/D "%WINPYWORKDIR%"
10391039
if "%QT_API%"=="pyqt5" (
1040-
"%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
1040+
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
1041+
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
1042+
) else (
1043+
"%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
1044+
)
10411045
) else (
10421046
"%WINPYDIR%\Lib\site-packages\PyQt4\designer.exe" %*
10431047
)
@@ -1047,7 +1051,11 @@ def _create_batch_scripts(self):
10471051
call "%~dp0env_for_icons.bat"
10481052
cd/D "%WINPYWORKDIR%"
10491053
if "%QT_API%"=="pyqt5" (
1050-
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
1054+
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
1055+
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
1056+
) else (
1057+
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
1058+
)
10511059
) else (
10521060
"%WINPYDIR%\Lib\site-packages\PyQt4\assistant.exe" %*
10531061
)
@@ -1057,8 +1065,11 @@ def _create_batch_scripts(self):
10571065
call "%~dp0env_for_icons.bat"
10581066
cd/D "%WINPYWORKDIR%"
10591067
if "%QT_API%"=="pyqt5" (
1060-
cd/D "%WINPYDIR%\Lib\site-packages\PyQt5"
1061-
"%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" %*
1068+
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
1069+
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" %*
1070+
) else (
1071+
cd/D "%WINPYDIR%\Lib\site-packages\PyQt5"
1072+
"%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" %*
10621073
) else (
10631074
cd/D "%WINPYDIR%\Lib\site-packages\PyQt4"
10641075
"%WINPYDIR%\Lib\site-packages\PyQt4\linguist.exe" %*

0 commit comments

Comments
 (0)