Rename PySide2 to PySide6

Adapt CMake files, build scripts, tests and examples.

Task-number: PYSIDE-904
Change-Id: I845f7b006e9ad274fed5444ec4c1f9dbe176ff88
Reviewed-by: Christian Tismer <[email protected]>

Author: FriedemannKleint

.gitignore

@@ -1,4 +1,4 @@
-## PySide2
+## PySide6
 /pyside*_build
 /pyside*_install
 /PySide

CMakeLists.txt

@@ -3,22 +3,22 @@ cmake_policy(VERSION 3.16)
 
 set(CMAKE_BUILD_TYPE Release CACHE STRING "Build Type")
 
-project(pyside2_super_project)
+project(pyside6_super_project)
 
 if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(FATAL_ERROR "In-source builds are not allowed.")
 endif()
 
-# Used to prevent overriding message function in both shiboken6 and pyside2.
-set(is_pyside2_superproject_build 1)
+# Used to prevent overriding message function in both shiboken6 and pyside6.
+set(is_pyside6_superproject_build 1)
 
 add_subdirectory(sources/shiboken6)
 
 # Semi-hack to include exported shiboken variables.
 list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/shiboken6/data")
-add_subdirectory(sources/pyside2)
+add_subdirectory(sources/pyside6)
 
 add_subdirectory(sources/pyside-tools)
 
-# Semi-hack to include exported pyside2 variables.
-list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/pyside2/libpyside")
+# Semi-hack to include exported pyside6 variables.
+list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_BINARY_DIR}/sources/pyside6/libpyside")

LICENSE.COMMERCIAL

@@ -895,7 +895,7 @@ object code form only (“Redistributables”) under this Agreement:
 - The Licensed Software's QML (“Qt Quick”) launcher tool (“qmlscene” or
 “qmlviewer”)
 - The Licensed Software's installer framework
-- Qt for Python (PySide2)
+- Qt for Python (PySide6)
 
 2. Parts of the Licensed Software that are not permitted for distribution
 include, but are not limited to:

README.md

@@ -1,12 +1,12 @@
 # Qt For Python
 
-Qt For Python is the [Python Qt bindings project](http://wiki.qt.io/PySide2),
+Qt For Python is the [Python Qt bindings project](http://wiki.qt.io/PySide6),
 providing access to the complete Qt framework as well as to generator tools for
 rapidly generating bindings for any C++ libraries.
 
 Shiboken is the generator used to build the bindings.
 
-See README.pyside2.md and README.shiboken6.md for details.
+See README.pyside6.md and README.shiboken6.md for details.
 
 ## Building
 
@@ -21,7 +21,7 @@ The same setup.py script is used to build all the components of the project:
 
  * shiboken6 (the supporting Python module)
  * shiboken6-generator (the bindings generation executable)
- * PySide2
+ * PySide6
 
 Preferably, a Qt (build) environment should be used to automatically pick up
 the associated `qmake`, but optionally one can specify the location of `qmake`
@@ -38,10 +38,10 @@ be built:
 
  * `--build-type=shiboken6`, build/package only the python module
  * `--build-type=shiboken6-generator`, build/package the generator executable
- * `--build-type=pyside2`, build/package the PySide2 bindings.
+ * `--build-type=pyside6`, build/package the PySide6 bindings.
  * `--build-type=all`, the implicit default to build all of the above
 
-When building PySide2, optionally, one can specify the location of the
+When building PySide6, optionally, one can specify the location of the
 shiboken6 cmake config path if it is not on the current PATH with:
 
  * `--shiboken-config-dir=/path/to/shiboken/cmake/config/dir`
@@ -55,18 +55,18 @@ directory path that contains the OpenSSL shared libraries `libeay32.dll` and
 
 * `--openssl=C:\OpenSSL-Win64\bin`
 
-This will make sure that the libraries are copied into the PySide2 package and
+This will make sure that the libraries are copied into the PySide6 package and
 are found by the QtNetwork module.
 
 ## Building Additional Options
 
 On Linux and macOS you can use the option `--standalone` to embed Qt libraries
-into the PySide2 package.  The option does not affect Windows, because it is
-used implicitly, i.e. all relevant DLLs have to be copied into the PySide2
+into the PySide6 package.  The option does not affect Windows, because it is
+used implicitly, i.e. all relevant DLLs have to be copied into the PySide6
 package anyway, because there is no proper rpath support on the platform.
 
 You can use the option `--rpath=/path/to/lib/path` to specify which rpath
-values should be embedded into the PySide2 modules and shared libraries.  This
+values should be embedded into the PySide6 modules and shared libraries.  This
 overrides the automatically generated values when the option is not specified.
 
 You can use the option `--only-package` if you want to create more binary
@@ -75,13 +75,13 @@ every time:
 
 e.g.:
 
-* First, we create a bdist_wheel from a full PySide2 build:
+* First, we create a bdist_wheel from a full PySide6 build:
   ```
   python setup.py bdist_wheel --qmake=c:\Qt\5.12\bin\qmake.exe
         --cmake=c:\tools\cmake\bin\cmake.exe
         --openssl=c:\libs\OpenSSL32bit\bin
   ```
-* Then, we create a bdist_egg reusing the PySide2 build with option
+* Then, we create a bdist_egg reusing the PySide6 build with option
   `--only-package`:
   ```
   python setup.py bdist_egg --only-package
@@ -91,7 +91,7 @@ e.g.:
   ```
 
 You can use the option `--qt-conf-prefix` to pass a path relative to the
-PySide2 installed package, which will be embedded into an auto-generated
+PySide6 installed package, which will be embedded into an auto-generated
 `qt.conf` registered in the Qt resource system.  This path will serve as the
 PrefixPath for QLibraryInfo, thus allowing to choose where Qt plugins should be
 loaded from.  This option overrides the usual prefix chosen by `--standalone`
@@ -172,7 +172,7 @@ OpenSSL.
 On Linux, official Qt builds will try to pick up the system OpenSSL library.
 
 > **Note**: this means that Qt packages that directly link to the OpenSSL
-> shared libraries, are not currently compatible with standalone PySide2
+> shared libraries, are not currently compatible with standalone PySide6
 > packages.
 
 #### macOS SDK:

README.pyside2.md renamed to README.pyside6.md

@@ -1,8 +1,8 @@
-# PySide2
+# PySide6
 
 ### Introduction
 
-PySide2 is the official Python module from the
+PySide6 is the official Python module from the
 [Qt for Python project](http://wiki.qt.io/Qt_for_Python),
 which provides access to the complete Qt 5.12+ framework.
 
@@ -15,15 +15,15 @@ design process. We welcome any contribution conforming to the
 
 Since the release of the [Technical Preview](https://blog.qt.io/blog/2018/06/13/qt-python-5-11-released/)
 it is possible to install via `pip`, both from Qt's servers
-and [PyPi](https://pypi.org/project/PySide2/):
+and [PyPi](https://pypi.org/project/PySide6/):
 
 ```
-pip install PySide2
+pip install PySide6
 ```
 
 #### Dependencies
 
-PySide2 versions following 5.12 use a C++ parser based on
+PySide6 versions following 5.12 use a C++ parser based on
 [Clang](http://clang.org/). The Clang library (C-bindings), version 6.0 or
 higher is required for building. Prebuilt versions of it can be downloaded from
 [download.qt.io](http://download.qt.io/development_releases/prebuilt/libclang/).
@@ -45,7 +45,7 @@ SET LLVM_INSTALL_DIR=%CD%\libclang
 
 ### Building from source
 
-For building PySide2 from scratch, please read about
+For building PySide6 from scratch, please read about
 [getting started](https://wiki.qt.io/Qt_for_Python/GettingStarted).
 This process will include getting the code:
 
@@ -68,7 +68,7 @@ in [our wiki](https://wiki.qt.io/Qt_for_Python/).
 
 ### Documentation and Bugs
 
-You can find more information about the PySide2 module API in the
+You can find more information about the PySide6 module API in the
 [official Qt for Python documentation](https://doc.qt.io/qtforpython/).
 
 If you come across any issue, please file a bug report at our
@@ -82,7 +82,7 @@ Check *#qt-pyside*, our official IRC channel on FreeNode, or contact us via our
 
 ### Licensing
 
-PySide2 is available under both Open Source (LGPLv3/GPLv2) and commercial
+PySide6 is available under both Open Source (LGPLv3/GPLv2) and commercial
 license.  Using PyPi is the recommended installation source, because the
 content of the wheels is valid for both cases.  For more information, refer to
 the [Qt Licensing page](https://www.qt.io/licensing/).

build_history/blacklist.txt

@@ -58,7 +58,7 @@
     linux
     darwin
     win32
-# AttributeError: 'PySide2.QtQuick.QQuickItem' object has no attribute 'simpleFunction'
+# AttributeError: 'PySide6.QtQuick.QQuickItem' object has no attribute 'simpleFunction'
 [QtQml::bug_451]
     py2
     py3

build_scripts/config.py

@@ -58,11 +58,11 @@ def __init__(self):
         self.invocation_type = None
 
         # The type of the top-level build.
-        # all - build shiboken6 module, shiboken6-generator and PySide2
+        # all - build shiboken6 module, shiboken6-generator and PySide6
         #       modules
         # shiboken6 - build only shiboken6 module
         # shiboken6-generator - build only the shiboken6-generator
-        # pyside2 - build only PySide2 modules
+        # pyside6 - build only PySide6 modules
         self.build_type = None
 
         # The internal build type, used for internal invocations of

build_scripts/main.py

@@ -419,7 +419,7 @@ def __init__(self, *args, **kwargs):
     def install(self):
         """
         Installs files from build/xxx directory into final
-        site-packages/PySide2 directory.
+        site-packages/PySide6 directory.
         """
 
         if os.path.isdir(self.build_dir):
@@ -1115,7 +1115,7 @@ def rpath_cmd(srcpath):
 
         pyside_libs.extend(executables)
 
-        # Update rpath in PySide2 libs
+        # Update rpath in PySide6 libs
         for srcname in pyside_libs:
             srcpath = os.path.join(package_path, srcname)
             if os.path.isdir(srcpath) or os.path.islink(srcpath):
@@ -1156,7 +1156,7 @@ def initialize_options(self):
                 raise DistutilsSetupError("Sphinx not found - aborting")
             self.html_dir = "html"
 
-            # creating directories html/pyside2/shiboken6
+            # creating directories html/pyside6/shiboken6
             try:
                 if not os.path.isdir(self.html_dir):
                     os.mkdir(self.html_dir)
@@ -1169,7 +1169,7 @@ def initialize_options(self):
                         os.mkdir(out_shiboken)
                     self.out_dir = out_shiboken
                 # We know that on the shiboken step, we already created the
-                # 'pyside2' directory
+                # 'pyside6' directory
                 elif self.name == PYSIDE:
                     self.out_dir = os.path.join(self.html_dir, PYSIDE)
             except:

build_scripts/platforms/unix.py

@@ -175,14 +175,14 @@ def adjusted_lib_name(name, version):
             "{st_build_dir}/{st_package_name}/glue",
             vars=vars)
 
-        # <source>/pyside2/{st_package_name}/support/* ->
+        # <source>/pyside6/{st_package_name}/support/* ->
         #   <setup>/{st_package_name}/support/*
         copydir(
             f"{{build_dir}}/{PYSIDE}/{{st_package_name}}/support",
             "{st_build_dir}/{st_package_name}/support",
             vars=vars)
 
-        # <source>/pyside2/{st_package_name}/*.pyi ->
+        # <source>/pyside6/{st_package_name}/*.pyi ->
         #   <setup>/{st_package_name}/*.pyi
         copydir(
             f"{{build_dir}}/{PYSIDE}/{{st_package_name}}",

build_scripts/platforms/windows_desktop.py

@@ -140,7 +140,7 @@ def prepare_packages_win32(self, vars):
             vars=vars)
 
     if config.is_internal_pyside_build():
-        # <build>/pyside2/{st_package_name}/*.pdb ->
+        # <build>/pyside6/{st_package_name}/*.pdb ->
         # <setup>/{st_package_name}
         copydir(
             f"{{build_dir}}/{PYSIDE}/{{st_package_name}}",
@@ -186,14 +186,14 @@ def prepare_packages_win32(self, vars):
             "{st_build_dir}/{st_package_name}/glue",
             vars=vars)
 
-        # <source>/pyside2/{st_package_name}/support/* ->
+        # <source>/pyside6/{st_package_name}/support/* ->
         #   <setup>/{st_package_name}/support/*
         copydir(
             f"{{build_dir}}/{PYSIDE}/{{st_package_name}}/support",
             "{st_build_dir}/{st_package_name}/support",
             vars=vars)
 
-        # <source>/pyside2/{st_package_name}/*.pyi ->
+        # <source>/pyside6/{st_package_name}/*.pyi ->
         #   <setup>/{st_package_name}/*.pyi
         copydir(
             "{build_dir}/{PYSIDE}/{st_package_name}",
@@ -367,7 +367,7 @@ def qt_build_config_filter(patterns, file_name, file_full_path):
 
         # In debug_and_release case, choosing which files to copy
         # is more difficult. We want to copy only the files that
-        # match the PySide2 build type. So if PySide2 is built in
+        # match the PySide6 build type. So if PySide6 is built in
         # debug mode, we want to copy only Qt debug libraries
         # (ending with "d.dll"). Or vice versa. The problem is that
         # some libraries have "d" as the last character of the

build_scripts/setup_runner.py

@@ -129,7 +129,7 @@ def run_setup(self):
             raise RuntimeError("Invalid '{}' option given to --build-type. "
                                .format(config.build_type))
 
-        # Build everything: shiboken6, shiboken6-generator and PySide2.
+        # Build everything: shiboken6, shiboken6-generator and PySide6.
         help_requested = '--help' in self.sub_argv or '-h' in self.sub_argv
         if help_requested:
             self.add_setup_internal_invocation(config.pyside_option_name)

build_scripts/versions.py

@@ -38,6 +38,6 @@
 #############################################################################
 
 
-PYSIDE = 'pyside2'
-PYSIDE_MODULE = 'PySide2'
+PYSIDE = 'pyside6'
+PYSIDE_MODULE = 'PySide6'
 SHIBOKEN = 'shiboken6'

build_scripts/wheel_override.py

@@ -100,8 +100,8 @@ def wheel_dist_name(self):
         # Slightly modified version of wheel's wheel_dist_name
         # method, to add the Qt version as well.
         # Example:
-        #   PySide2-5.6-5.6.4-cp27-cp27m-macosx_10_10_intel.whl
-        # The PySide2 version is "5.6".
+        #   PySide6-5.6-5.6.4-cp27-cp27m-macosx_10_10_intel.whl
+        # The PySide6 version is "5.6".
         # The Qt version built against is "5.6.4".
         wheel_version = "{}-{}".format(self._package_version, get_qt_version())
         components = (_safer_name(self.distribution.get_name()), wheel_version)

build_scripts/wheel_utils.py

@@ -79,7 +79,7 @@ def get_qt_version():
 
 @memoize
 def get_package_version():
-    """ Returns the version string for the PySide2 package. """
+    """ Returns the version string for the PySide6 package. """
     setup_script_dir = os.getcwd()
     pyside_version_py = os.path.join(
         setup_script_dir, "sources", PYSIDE, "pyside_version.py")
@@ -112,7 +112,7 @@ def macos_qt_min_deployment_target():
 @memoize
 def macos_pyside_min_deployment_target():
     """
-    Compute and validate PySide2 MACOSX_DEPLOYMENT_TARGET value.
+    Compute and validate PySide6 MACOSX_DEPLOYMENT_TARGET value.
     Candidate sources that are considered:
         - setup.py provided value
         - maximum value between minimum deployment target of the

coin_build_instructions.py

@@ -94,7 +94,7 @@ def is_snapshot_build():
     """
     setup_script_dir = get_current_script_path()
     pyside_version_py = os.path.join(
-        setup_script_dir, "sources", "pyside2", "pyside_version.py")
+        setup_script_dir, "sources", "pyside6", "pyside_version.py")
     d = get_python_dict(pyside_version_py)
 
     release_version_type = d['release_version_type']

examples/3d/simple3d.py

@@ -39,13 +39,13 @@
 ##
 #############################################################################
 
-"""PySide2 port of the qt3d/simple-cpp example from Qt v5.x"""
+"""PySide6 port of the qt3d/simple-cpp example from Qt v5.x"""
 
 import sys
-from PySide2.QtCore import(Property, QObject, QPropertyAnimation, Signal)
-from PySide2.QtGui import (QGuiApplication, QMatrix4x4, QQuaternion, QVector3D)
-from PySide2.Qt3DCore import (Qt3DCore)
-from PySide2.Qt3DExtras import (Qt3DExtras)
+from PySide6.QtCore import(Property, QObject, QPropertyAnimation, Signal)
+from PySide6.QtGui import (QGuiApplication, QMatrix4x4, QQuaternion, QVector3D)
+from PySide6.Qt3DCore import (Qt3DCore)
+from PySide6.Qt3DExtras import (Qt3DExtras)
 
 class OrbitTransformController(QObject):
     def __init__(self, parent):

examples/axcontainer/axviewer.py

@@ -39,12 +39,12 @@
 ##
 #############################################################################
 
-"""PySide2 Active Qt Viewer example"""
+"""PySide6 Active Qt Viewer example"""
 
 import sys
-from PySide2.QtAxContainer import QAxSelect, QAxWidget
-from PySide2.QtGui import QAction
-from PySide2.QtWidgets import (QApplication, QDialog,
+from PySide6.QtAxContainer import QAxSelect, QAxWidget
+from PySide6.QtGui import QAction
+from PySide6.QtWidgets import (QApplication, QDialog,
     QMainWindow, QMessageBox, QToolBar)
 
 class MainWindow(QMainWindow):