8000 Merge pull request #1021 from stonebig/master · forgeTOE/winpython@629f4e4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 629f4e4

Browse files
stonebigstonebig
authored
Merge pull request winpython#1021 from stonebig/master
better PySide6-6.2 support
2 parents a9db986 + 608d713 commit 629f4e4

File tree

2 files changed

+16
-7
lines changed

2 files changed

+16
-7
lines changed

‎make.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1824,11 +1824,13 @@ def _create_batch_scripts(self):
18241824
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\designer.exe" %*
18251825
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" (
18261826
"%WINPYDIR%\Lib\site-packages\PyQt5\designer.exe" %*
1827-
) else (
1827+
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" (
18281828
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
1829+
) else (
1830+
"%WINPYDIR%\Lib\site-packages\PySide6\designer.exe" %*
18291831
)
18301832
) else (
1831-
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
1833+
"%WINPYDIR%\Lib\site-packages\PySide6\designer.exe" %*
18321834
)
18331835
""",
18341836
)
@@ -1850,11 +1852,13 @@ def _create_batch_scripts(self):
18501852
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\assistant.exe" %*
18511853
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" (
18521854
"%WINPYDIR%\Lib\site-packages\PyQt5\assistant.exe" %*
1853-
) else (
1855+
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" (
18541856
"%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
1857+
) else (
1858+
"%WINPYDIR%\Lib\site-packages\PySide6\assistant.exe" %*
18551859
)
18561860
) else (
1857-
"%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
1861+
"%WINPYDIR%\Lib\site-packages\PySide6\assistant.exe" %*
18581862
)
18591863
""",
18601864
)
@@ -1876,12 +1880,17 @@ def _create_batch_scripts(self):
18761880
"%WINPYDIR%\Lib\site-packages\pyqt5-tools\linguist.exe" %*
18771881
) else if exist "%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" (
18781882
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*
1879-
) else (
1883+
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" (
18801884
cd/D "%WINPYDIR%\Lib\site-packages\PyQt5"
18811885
"%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" %*
1886+
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*
1887+
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" (
1888+
"%%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" %*
1889+
) else (
1890+
"%WINPYDIR%\Lib\site-packages\PySide6\linguist.exe" %*
18821891
)
18831892
) else (
1884-
"%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" %*
1893+
"%WINPYDIR%\Lib\site-packages\PySide6\linguist.exe" %*
18851894
)
18861895
18871896
""",

‎winpython/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '4.5.20210926'
31+
__version__ = '4.6.20211010'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)
0