Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3c46ed5

Browse files
authored
Merge pull request#881 from winpython/PierreRaybaut-patch-pyqt5_tools
Fixed Qt scripts/launchers for pyqt5_tools 5.15
2 parents114716a +55479b0 commit3c46ed5

File tree

1 file changed

+30
-3
lines changed

1 file changed

+30
-3
lines changed

‎make.py

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,15 @@ def _create_batch_scripts_initial(self):
10661066
:pyqt5_conf_exist
10671067
10681068
1069+
rem ******************
1070+
rem handle pyqt5_tools if included
1071+
rem ******************
1072+
set tmp_pyz=%WINPYDIR%\Lib\site-packages\pyqt5_tools
1073+
if not exist "%tmp_pyz%" goto end_pyqt5_tools_conf
1074+
set QT_PLUGIN_PATH=%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\plugins
1075+
:end_pyqt5_tools_conf
1076+
1077+
10691078
rem ******************
10701079
rem handle Pyzo configuration part
10711080
rem ******************
@@ -1213,6 +1222,15 @@ def _create_batch_scripts_initial(self):
12131222
}
12141223
12151224
1225+
#####################
1226+
### handle pyqt5_tools if included
1227+
#####################
1228+
$env:tmp_pyz = "$env:WINPYDIR\Lib\site-packages\pyqt5_tools"
1229+
if (Test-Path "$env:tmp_pyz") {
1230+
$env:QT_PLUGIN_PATH = "WINPYDIR\Lib\site-packages\pyqt5_tools\Qt\plugins"
1231+
}
1232+
1233+
12161234
#####################
12171235
### handle Pyzo configuration part
12181236
#####################
@@ -1686,8 +1704,11 @@ def _create_batch_scripts(self):
16861704
r"""@echo off
16871705
call "%~dp0env_for_icons.bat"
16881706
cd/D "%WINPYWORKDIR%"
1707+
if "%QT_API%"=="" ( set QT_API=pyqt5 )
16891708
if "%QT_API%"=="pyqt5" (
1690-
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
1709+
if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" (
1710+
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" %*
1711+
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
16911712
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
16921713
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" (
16931714
"%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
@@ -1705,8 +1726,11 @@ def _create_batch_scripts(self):
17051726
r"""@echo off
17061727
call "%~dp0env_for_icons.bat"
17071728
cd/D "%WINPYWORKDIR%"
1729+
if "%QT_API%"=="" ( set QT_API=pyqt5 )
17081730
if "%QT_API%"=="pyqt5" (
1709-
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
1731+
if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" (
1732+
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" %*
1733+
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
17101734
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
17111735
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" (
17121736
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
@@ -1724,8 +1748,11 @@ def _create_batch_scripts(self):
17241748
r"""@echo off
17251749
call "%~dp0env_for_icons.bat"
17261750
cd/D "%WINPYWORKDIR%"
1751+
if "%QT_API%"=="" ( set QT_API=pyqt5 )
17271752
if "%QT_API%"=="pyqt5" (
1728-
if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
1753+
if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" (
1754+
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" %*
1755+
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
17291756
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" %*
17301757
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" (
17311758
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp