Skip to content

Fixed Qt scripts/launchers for pyqt5_tools 5.15 #881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Aug 22, 2020
Merged

Fixed Qt scripts/launchers for pyqt5_tools 5.15 #881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ******************
Expand Down Expand Up @@ -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
#####################
Expand Down Expand Up @@ -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" %*
Expand All @@ -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" %*
Expand All @@ -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" %*
Expand Down