Merge pull request winpython#1021 from stonebig/master

stonebig · web-flow · commit 629f4e4e889b · 2021-10-10T00:38:19.000+02:00
better PySide6-6.2 support
diff --git a/make.py b/make.py
@@ -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" %*
 )
 """,
         )
@@ -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" %*
 )
 """,
         )
@@ -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" %*
 )
 
 """,
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -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/'
