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
Appearance settings

Commit 954276c

Browse filesBrowse files
stonebigstonebig
authored
Merge pull request #885 from winpython/PierreRaybaut-pyqt5tools-patch2
Fixed Qt scripts/launchers for pyqt5_tools 5.15.0.1.7.1
2 parents 3c46ed5 + adfb55e commit 954276c
Copy full SHA for 954276c

1 file changed

+11-5Lines changed: 11 additions & 5 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎make.py‎

Copy file name to clipboardExpand all lines: make.py
+11-5Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,7 +1706,9 @@ def _create_batch_scripts(self):
17061706
cd/D "%WINPYWORKDIR%"
17071707
if "%QT_API%"=="" ( set QT_API=pyqt5 )
17081708
if "%QT_API%"=="pyqt5" (
1709-
if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" (
1709+
if exist "%WINPYDIR%\Scripts\designer.exe" (
1710+
"%WINPYDIR%\Scripts\designer.exe" %*
1711+
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" (
17101712
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\designer.exe" %*
17111713
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" (
17121714
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
@@ -1728,17 +1730,19 @@ def _create_batch_scripts(self):
17281730
cd/D "%WINPYWORKDIR%"
17291731
if "%QT_API%"=="" ( set QT_API=pyqt5 )
17301732
if "%QT_API%"=="pyqt5" (
1731-
if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" (
1733+
if exist "%WINPYDIR%\Scripts\assistant.exe" (
1734+
"%WINPYDIR%\Scripts\assistant.exe" %*
1735+
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" (
17321736
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\assistant.exe" %*
17331737
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" (
17341738
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
17351739
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" (
17361740
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
17371741
) else (
1738-
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
1742+
"%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
17391743
)
17401744
) else (
1741-
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
1745+
"%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
17421746
)
17431747
""",
17441748
)
@@ -1750,7 +1754,9 @@ def _create_batch_scripts(self):
17501754
cd/D "%WINPYWORKDIR%"
17511755
if "%QT_API%"=="" ( set QT_API=pyqt5 )
17521756
if "%QT_API%"=="pyqt5" (
1753-
if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" (
1757+
if exist "%WINPYDIR%\Scripts\linguist.exe" (
1758+
"%WINPYDIR%\Scripts\linguist.exe" %*
1759+
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" (
17541760
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\Qt\bin\linguist.exe" %*
17551761
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" (
17561762
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" %*

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.