8000 better PySide6-6.2 support by stonebig · Pull Request #1021 · winpython/winpython · GitHub
[go: up one dir, main page]
Skip to content

better PySide6-6.2 support #1021

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
merged 1 commit into from
Oct 9, 2021
Merged

better PySide6-6.2 support #1021

Show file tree
Hide file tree
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
better PySide6-6.2 support
  • Loading branch information
@stonebig
stonebig committed Oct 9, 2021
commit 608d713ea6a44ec63a0f61fbfcaa6b6cb70fdbfd
21 changes: 15 additions & 6 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1824,11 +1824,13 @@ def _create_batch_scripts(self):
"%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" %*
) else (
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" (
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
) else (
"%WINPYDIR%\Lib\site-packages\PySide6\designer.exe" %*
)
) else (
"%WINPYDIR%\Lib\site-packages\PySide2\designer.exe" %*
"%WINPYDIR%\Lib\site-packages\PySide6\designer.exe" %*
)
""",
)
Expand All @@ -1850,11 +1852,13 @@ def _create_batch_scripts(self):
"%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" %*
) else (
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" (
"%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
) else (
"%WINPYDIR%\Lib\site-packages\PySide6\assistant.exe" %*
)
) else (
"%WINPYDIR%\Lib\site-packages\PySide2\assistant.exe" %*
"%WINPYDIR%\Lib\site-packages\PySide6\assistant.exe" %*
)
""",
)
Expand All @@ -1876,12 +1880,17 @@ def _create_batch_scripts(self):
"%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" %*
) else (
) else if exist "%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" (
cd/D "%WINPYDIR%\Lib\site-packages\PyQt5"
"%WINPYDIR%\Lib\site-packages\PyQt5\linguist.exe" %*
"%WINPYDIR%\Lib\site-packages\pyqt5_tools\linguist.exe" %*
) else if exist "%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" (
"%%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" %*
) else (
"%WINPYDIR%\Lib\site-packages\PySide6\linguist.exe" %*
)
) else (
"%WINPYDIR%\Lib\site-packages\PySide2\linguist.exe" %*
"%WINPYDIR%\Lib\site-packages\PySide6\linguist.exe" %*
)

""",
Expand Down
2 changes: 1 addition & 1 deletion winpython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"""

__version__ = '4.5.20210926'
__version__ = '4.6.20211010'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'
0