Rename shiboken2 to shiboken6

Adapt CMake files, build scripts, tests and examples.

Task-number: PYSIDE-904
Change-Id: I4cb5ee4c8df539546014b08202a7b1e98ed3ff07
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

24 files changed, 71 insertions, 71 deletions

diff --git a/sources/pyside2/CMakeLists.txt b/sources/pyside2/CMakeLists.txt
index df605b45a..cd228bf8b 100644
--- a/sources/pyside2/CMakeLists.txt
+++ b/sources/pyside2/CMakeLists.txt
@@ -11,7 +11,7 @@ set (QT_MAJOR_VERSION 6)
 project(pysidebindings)
 
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../cmake_helpers/
-                      ${CMAKE_CURRENT_SOURCE_DIR}/../shiboken2/data/
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../shiboken6/data/
                       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Macros/
                       ${CMAKE_MODULE_PATH})
 include(shiboken_helpers)
@@ -63,7 +63,7 @@ else()
     set(PATH_SEP ":")
 endif()
 
-find_package(Shiboken2 2.0.0 REQUIRED)
+find_package(Shiboken6 2.0.0 REQUIRED)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "${SHIBOKEN_BUILD_TYPE}" CACHE STRING "Build Type")
diff --git a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
index 31f0b8343..43ed7a60e 100644
--- a/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
+++ b/sources/pyside2/PySide2/QtUiTools/typesystem_uitools.xml
@@ -62,7 +62,7 @@
          of the `.ui` file.
 
          (Remember that `duck punching virtual methods is an invitation for your own demise!
-         <https://doc.qt.io/qtforpython/shiboken2/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
+         <https://doc.qt.io/qtforpython/shiboken6/wordsofadvice.html#duck-punching-and-virtual-methods>`_)
 
          Let's see an obvious example. If you want to create a new widget it's probable you'll end up
          overriding :class:`~PySide2.QtGui.QWidget`'s :meth:`~PySide2.QtGui.QWidget.paintEvent` method.
diff --git a/sources/pyside2/PySide2/__init__.py.in b/sources/pyside2/PySide2/__init__.py.in
index 035cdd636..89c47ae80 100644
--- a/sources/pyside2/PySide2/__init__.py.in
+++ b/sources/pyside2/PySide2/__init__.py.in
@@ -11,20 +11,20 @@ __version_info__ = (@BINDING_API_MAJOR_VERSION@, @BINDING_API_MINOR_VERSION@, @B
 
 
 def _additional_dll_directories(package_dir):
-    # Find shiboken2 relative to the package directory.
+    # Find shiboken6 relative to the package directory.
     root = os.path.dirname(package_dir)
     # Check for a flat .zip as deployed by cx_free(PYSIDE-1257)
     if root.endswith('.zip'):
         return []
-    shiboken2 = os.path.join(root, 'shiboken2')
-    if os.path.isdir(shiboken2): # Standard case, only shiboken2 is needed
-        return [shiboken2]
+    shiboken6 = os.path.join(root, 'shiboken6')
+    if os.path.isdir(shiboken6): # Standard case, only shiboken6 is needed
+        return [shiboken6]
     # The below code is for the build process when generate_pyi.py
     # is executed in the build directory. We need libpyside and Qt in addition.
-    shiboken2 = os.path.join(os.path.dirname(root), 'shiboken2', 'libshiboken')
-    if not os.path.isdir(shiboken2):
-        raise ImportError(shiboken2 + ' does not exist')
-    result = [shiboken2, os.path.join(root, 'libpyside')]
+    shiboken6 = os.path.join(os.path.dirname(root), 'shiboken6', 'libshiboken')
+    if not os.path.isdir(shiboken6):
+        raise ImportError(shiboken6 + ' does not exist')
+    result = [shiboken6, os.path.join(root, 'libpyside')]
     for path in os.environ.get('PATH').split(';'):
         if path:
              if os.path.exists(os.path.join(path, 'qmake.exe')):
@@ -34,13 +34,13 @@ def _additional_dll_directories(package_dir):
 
 
 def _setupQtDirectories():
-    # On Windows we need to explicitly import the shiboken2 module so
+    # On Windows we need to explicitly import the shiboken6 module so
     # that the libshiboken.dll dependency is loaded by the time a
     # Qt module is imported. Otherwise due to PATH not containing
-    # the shiboken2 module path, the Qt module import would fail
+    # the shiboken6 module path, the Qt module import would fail
     # due to the missing libshiboken dll.
     # In addition, as of Python 3.8, the shiboken package directory
-    # must be added to the DLL search paths so that shiboken2.dll
+    # must be added to the DLL search paths so that shiboken6.dll
     # is found.
     # We need to do the same on Linux and macOS, because we do not
     # embed rpaths into the PySide2 libraries that would point to
@@ -55,10 +55,10 @@ def _setupQtDirectories():
             os.add_dll_directory(dir)
 
     try:
-        import shiboken2
+        import shiboken6
     except Exception:
         paths = ', '.join(sys.path)
-        print('PySide2/__init__.py: Unable to import shiboken2 from {}'.format(paths),
+        print('PySide2/__init__.py: Unable to import shiboken6 from {}'.format(paths),
               file=sys.stderr)
         raise
 
@@ -73,9 +73,9 @@ def _setupQtDirectories():
             PySide2/__init__.py: The `signature` module was not initialized.
             This libshiboken module was loaded from
 
-            "{shiboken2.__file__}".
+            "{shiboken6.__file__}".
 
-            Please make sure that this is the real shiboken2 binary and not just a folder.
+            Please make sure that this is the real shiboken6 binary and not just a folder.
             {stars}
             ''').format(stars=79*"*", **locals()), file=sys.stderr)
         raise
diff --git a/sources/pyside2/PySide2/support/__init__.py b/sources/pyside2/PySide2/support/__init__.py
index 8764fb5cb..996acb05a 100644
--- a/sources/pyside2/PySide2/support/__init__.py
+++ b/sources/pyside2/PySide2/support/__init__.py
@@ -37,6 +37,6 @@
 ##
 #############################################################################
 
-from shiboken2 import VoidPtr
+from shiboken6 import VoidPtr
 
 #eof
diff --git a/sources/pyside2/PySide2/support/generate_pyi.py b/sources/pyside2/PySide2/support/generate_pyi.py
index d71ee338e..6cca2ebbe 100644
--- a/sources/pyside2/PySide2/support/generate_pyi.py
+++ b/sources/pyside2/PySide2/support/generate_pyi.py
@@ -147,7 +147,7 @@ class Formatter(Writer):
         self.print()
         self.print("class Object(object): pass")
         self.print()
-        self.print("import shiboken2 as Shiboken")
+        self.print("import shiboken6 as Shiboken")
         self.print("Shiboken.Object = Object")
         self.print()
         # This line will be replaced by the missing imports postprocess.
diff --git a/sources/pyside2/cmake/Macros/PySideModules.cmake b/sources/pyside2/cmake/Macros/PySideModules.cmake
index 5022002c9..bbaeb9ada 100644
--- a/sources/pyside2/cmake/Macros/PySideModules.cmake
+++ b/sources/pyside2/cmake/Macros/PySideModules.cmake
@@ -124,7 +124,7 @@ macro(create_pyside_module)
 
     add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
                         BYPRODUCTS ${${module_SOURCES}}
-                        COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
+                        COMMAND Shiboken6::shiboken6 ${GENERATOR_EXTRA_FLAGS}
                         "${pyside2_BINARY_DIR}/${module_NAME}_global.h"
                         --include-paths=${shiboken_include_dirs}
                         ${shiboken_framework_include_dirs_option}
@@ -154,7 +154,7 @@ macro(create_pyside_module)
     endif()
 
     target_link_libraries(${module_NAME} ${${module_LIBRARIES}})
-    target_link_libraries(${module_NAME} Shiboken2::libshiboken)
+    target_link_libraries(${module_NAME} Shiboken6::libshiboken)
     if(${module_DEPS})
         add_dependencies(${module_NAME} ${${module_DEPS}})
     endif()
diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt
index 73b90c059..409fde41b 100644
--- a/sources/pyside2/doc/CMakeLists.txt
+++ b/sources/pyside2/doc/CMakeLists.txt
@@ -16,12 +16,12 @@ set(TS_ROOT "${ROOT}/PySide2")
 
 file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf ${CMAKE_CURRENT_LIST_DIR}/pyside.qdocconf.in)
 
-set(SHIBOKEN_INTERSPHINX_FILE "${ROOT}/pyside2/shiboken2/objects.inv")
+set(SHIBOKEN_INTERSPHINX_FILE "${ROOT}/pyside2/shiboken6/objects.inv")
 set(HAS_WEBENGINE_WIDGETS 0)
 set(SKIP_SPHINX_WARNINGS 1)
 if (FULLDOCSBUILD)
     set(SKIP_SPHINX_WARNINGS 0)
-    set(SHIBOKEN_INTERSPHINX_FILE "${CMAKE_BINARY_DIR}/doc/html/shiboken2/doc/html/objects.inv")
+    set(SHIBOKEN_INTERSPHINX_FILE "${CMAKE_BINARY_DIR}/doc/html/shiboken6/doc/html/objects.inv")
     # For Qt modules that are part of the documentation build:
     #    - Configure the module docconf file
     #    - Write shiboken header consisting of pyside2_global.h and module includes
@@ -131,10 +131,10 @@ add_custom_target(apidoc
 # and generate offline help based on the output format.
 if(DOC_OUTPUT_FORMAT STREQUAL "html")
     add_custom_command(TARGET apidoc POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken2
+            COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken6
             COMMAND ${CMAKE_COMMAND} -E copy_directory
-                    ${CMAKE_CURRENT_BINARY_DIR}/../../shiboken2/doc/html
-                    ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken2
+                    ${CMAKE_CURRENT_BINARY_DIR}/../../shiboken6/doc/html
+                    ${CMAKE_CURRENT_BINARY_DIR}/html/shiboken6
             COMMENT "Copying Shiboken docs..."
             VERBATIM)
 else()
@@ -151,7 +151,7 @@ configure_file("conf.py.in" "rst/conf.py" @ONLY)
 
 add_custom_target("docrsts"
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/rst
-    COMMAND Shiboken2::shiboken2 --generator-set=qtdoc ${docHeader}
+    COMMAND Shiboken6::shiboken6 --generator-set=qtdoc ${docHeader}
             --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside2_SOURCE_DIR}${PATH_SEP}${TS_ROOT}"
             --api-version=${SUPPORTED_QT_VERSION}
             --typesystem-paths="${QDOC_TYPESYSTEM_PATH}"
diff --git a/sources/pyside2/doc/conf.py.in b/sources/pyside2/doc/conf.py.in
index ae1bc6455..ff04dcf20 100644
--- a/sources/pyside2/doc/conf.py.in
+++ b/sources/pyside2/doc/conf.py.in
@@ -173,9 +173,9 @@ html_show_sourcelink = False
 # Output file base name for HTML help builder.
 #htmlhelp_basename = 'PySideDoc'
 
-# Link to the shiboken2 sphinx project to enable linking
+# Link to the shiboken6 sphinx project to enable linking
 # between the two projects.
-intersphinx_mapping = {'shiboken2': ('shiboken2','@SHIBOKEN_INTERSPHINX_FILE@')}
+intersphinx_mapping = {'shiboken6': ('shiboken6','@SHIBOKEN_INTERSPHINX_FILE@')}
 
 add_module_names = False
 
diff --git a/sources/pyside2/doc/contents.rst b/sources/pyside2/doc/contents.rst
index 598a65c92..6d0b25fb7 100644
--- a/sources/pyside2/doc/contents.rst
+++ b/sources/pyside2/doc/contents.rst
@@ -14,7 +14,7 @@
     licenses.rst
     modules.rst
     considerations.rst
-    shiboken2/index.rst
+    shiboken6/index.rst
 
 Module Index
 ============
diff --git a/sources/pyside2/doc/deployment-pyinstaller.rst b/sources/pyside2/doc/deployment-pyinstaller.rst
index e7ed643f6..d58ec2d7d 100644
--- a/sources/pyside2/doc/deployment-pyinstaller.rst
+++ b/sources/pyside2/doc/deployment-pyinstaller.rst
@@ -20,7 +20,7 @@ After installation, the `pyinstaller` binary is located in your virtual environm
 directory, or where your Python executable is located. If that directory isn't in your `PATH`,
 include the whole path when you run `pyinstaller`.
 
-.. warning:: If you already have a PySide2 or Shiboken2 version installed in your
+.. warning:: If you already have a PySide2 or Shiboken6 version installed in your
    system path, PyInstaller uses them instead of your virtual environment version.
 
 Freeze an application
@@ -119,7 +119,7 @@ PyInstaller Issue
 -----------------
 
 As mentioned before, if available, `PyInstaller` picks a system installation of PySide2 or
-Shiboken2 instead of your `virtualenv` version without notice. This is negligible if those
+Shiboken6 instead of your `virtualenv` version without notice. This is negligible if those
 two versions are the same.
 
 If you're working with different versions, this can result in frustrating debugging sessions
@@ -144,13 +144,13 @@ Safety Instructions
 -------------------
 
 - When using `PyInstaller` with `virtualenv`, make sure that there is no system
-  installation of PySide2 or shiboken2.
+  installation of PySide2 or shiboken6.
 
-- Before compiling, use `pip -uninstall pyside2 shiboken2 -y` multiple times, until
+- Before compiling, use `pip -uninstall pyside2 shiboken6 -y` multiple times, until
   none of the programs are found anymore.
 
 - Pip is usually a good tool. But to be 100 % sure, you should directly remove
-  the PySide2 and shiboken2 folders from site-packages.
+  the PySide2 and shiboken6 folders from site-packages.
 
 - Be sure to use the right version of pip. The safest way to really run the right
   pip, is to use the Python that you mean: Instead of the pip command, better use::
diff --git a/sources/pyside2/doc/faq.rst b/sources/pyside2/doc/faq.rst
index b7e9816c8..99721141b 100644
--- a/sources/pyside2/doc/faq.rst
+++ b/sources/pyside2/doc/faq.rst
@@ -17,21 +17,21 @@ Frequently Asked Questions
   The project's old wiki page is available on PySide, but the project is now deprecated and not
   supported.
 
-**There are three wheels (pyside2, shiboken2, and shiboken2_generator), what's the difference?**
+**There are three wheels (pyside2, shiboken6, and shiboken6_generator), what's the difference?**
 
   Before the official release, everything was in one big wheel, so it made sense to split these
   into separate wheels, each for the major projects currently in development:
 
    * **pyside2**: contains all the PySide2 modules to use the Qt framework; also depends on the
-     shiboken2 module.
-   * **shiboken2**: contains the shiboken2 module with helper functions for PySide2.
-   * **shiboken2_generator**: contains the generator binary that can work with a C++ project and a
+     shiboken6 module.
+   * **shiboken6**: contains the shiboken6 module with helper functions for PySide2.
+   * **shiboken6_generator**: contains the generator binary that can work with a C++ project and a
      typesystem to generate Python bindings.
      If you want to generate bindings for a Qt/C++ project, there won't be any linking to the Qt
      shared libraries; you need to do this by hand. We recommend building PySide2 from scratch
      to have everything properly linked.
 
-**Why is the shiboken2_generator not installed automatically?**
-  It's not necessary to install the shiboken2_generator to use PySide2. The package is a result of
+**Why is the shiboken6_generator not installed automatically?**
+  It's not necessary to install the shiboken6_generator to use PySide2. The package is a result of
   the wheel splitting process. To use the generator, it's recommended to build it from scratch to
   have the proper Qt linking.
diff --git a/sources/pyside2/doc/gettingstarted.rst b/sources/pyside2/doc/gettingstarted.rst
index 1623538cf..44320b25f 100644
--- a/sources/pyside2/doc/gettingstarted.rst
+++ b/sources/pyside2/doc/gettingstarted.rst
@@ -108,7 +108,7 @@ which will generate a ``html/`` directory with the following structure::
     └── pyside2
         ├── index.html
         ├── ...
-        └── shiboken2
+        └── shiboken6
             ├── index.html
             └── ...
 
@@ -148,7 +148,7 @@ directory, and run::
 
 Finally, you will get a ``html`` directory containing all the generated documentation. The offline
 help files, ``PySide.qch`` and ``Shiboken.qch``, can be moved to any directory of your choice. You
-can find ``Shiboken.qch`` in the build directory, ``*_build\*_release\shiboken2\doc\html``.
+can find ``Shiboken.qch`` in the build directory, ``*_build\*_release\shiboken6\doc\html``.
 
 Viewing offline documentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/sources/pyside2/doc/index.rst b/sources/pyside2/doc/index.rst
index 6c62334d5..5a4941afd 100644
--- a/sources/pyside2/doc/index.rst
+++ b/sources/pyside2/doc/index.rst
@@ -7,7 +7,7 @@
     has two main components:
 
     * `PySide2`_, so that you can use Qt5 APIs in your Python applications, and
-    * `Shiboken2 <shiboken2/index.html>`__, a binding generator tool, which can
+    * `Shiboken6 <shiboken6/index.html>`__, a binding generator tool, which can
       be used to expose C++ projects to Python, and a Python module with
       some utility functions.
 
@@ -17,7 +17,7 @@
     has two main components:
 
     * `PySide2`_, so that you can use Qt5 APIs in your Python applications, and
-    * `Shiboken2 <../shiboken2/index.html>`__, a binding generator tool, which can
+    * `Shiboken6 <../shiboken6/index.html>`__, a binding generator tool, which can
       be used to expose C++ projects to Python, and a Python module with
       some utility functions.
 
@@ -57,7 +57,7 @@ Documentation
             <tr>
                 <td><a href="deployment.html" style="display: block;"><p><strong>Deployment</strong><br/>Learn to deploy your apps.</p></a></td>
                 <td><a href="considerations.html" style="display: block;"><p><strong>Considerations</strong><br/>API differences and known issues.</p></a></td>
-                <td><a href="shiboken2/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
+                <td><a href="shiboken6/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
             </tr>
         </table>
 
@@ -86,7 +86,7 @@ Documentation
             <tr>
                 <td><a href="deployment.html" style="display: block;"><p><strong>Deployment</strong><br/>Learn to deploy your apps.</p></a></td>
                 <td><a href="considerations.html" style="display: block;"><p><strong>Considerations</strong><br/>API differences and known issues.</p></a></td>
-                <td><a href="../shiboken2/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
+                <td><a href="../shiboken6/index.html" style="display: block;"><p><strong>Shiboken</strong><br/>Generate C++ to Python binding.</p></a></td>
             </tr>
         </table>
 
diff --git a/sources/pyside2/libpyside/CMakeLists.txt b/sources/pyside2/libpyside/CMakeLists.txt
index 5e6ee86ba..579159c6a 100644
--- a/sources/pyside2/libpyside/CMakeLists.txt
+++ b/sources/pyside2/libpyside/CMakeLists.txt
@@ -93,7 +93,7 @@ target_include_directories(pyside2 PUBLIC
 )
 
 target_link_libraries(pyside2
-                      PRIVATE Shiboken2::libshiboken
+                      PRIVATE Shiboken6::libshiboken
                       PRIVATE ${QML_LIBRARIES}
                       PRIVATE ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES})
 
diff --git a/sources/pyside2/libpyside/pyside2.pc.in b/sources/pyside2/libpyside/pyside2.pc.in
index ecbe0bbc8..0653006f3 100644
--- a/sources/pyside2/libpyside/pyside2.pc.in
+++ b/sources/pyside2/libpyside/pyside2.pc.in
@@ -11,5 +11,5 @@ Description: Support library for Python bindings of Qt5-based libraries.
 Version: @BINDING_API_VERSION_FULL@
 Libs: -L${libdir} -lpyside2@pyside2_SUFFIX@@SHIBOKEN_PYTHON_CONFIG_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@
 Cflags: -I${includedir}
-Requires: shiboken2
+Requires: shiboken6
 
diff --git a/sources/pyside2/plugins/CMakeLists.txt b/sources/pyside2/plugins/CMakeLists.txt
index 9be985198..1d947fb44 100644
--- a/sources/pyside2/plugins/CMakeLists.txt
+++ b/sources/pyside2/plugins/CMakeLists.txt
@@ -33,7 +33,7 @@ target_link_libraries(uiplugin
                       Qt::Gui
                       Qt::UiPlugin
                       Qt::Widgets
-                      Shiboken2::libshiboken)
+                      Shiboken6::libshiboken)
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(LIBRARY_OUTPUT_SUFFIX ${CMAKE_DEBUG_POSTFIX})
 else()
diff --git a/sources/pyside2/tests/QtWidgets/qlabel_test.py b/sources/pyside2/tests/QtWidgets/qlabel_test.py
index 19387dee9..322e18b7c 100644
--- a/sources/pyside2/tests/QtWidgets/qlabel_test.py
+++ b/sources/pyside2/tests/QtWidgets/qlabel_test.py
@@ -38,7 +38,7 @@ init_test_paths(True)
 
 from PySide2.QtGui import QPixmap
 from PySide2.QtWidgets import QLabel
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 from helper.usesqapplication import UsesQApplication
 
diff --git a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
index f1c360b82..851231c42 100644
--- a/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstandarditemmodel_test.py
@@ -36,7 +36,7 @@ init_test_paths(False)
 
 from PySide2.QtGui import QStandardItemModel, QStandardItem
 from PySide2.QtWidgets import QWidget
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 
 from helper.usesqapplication import UsesQApplication
 
diff --git a/sources/pyside2/tests/init_paths.py b/sources/pyside2/tests/init_paths.py
index 9cfdebc86..c0a9cd984 100644
--- a/sources/pyside2/tests/init_paths.py
+++ b/sources/pyside2/tests/init_paths.py
@@ -33,7 +33,7 @@ import sys
 
 SRC_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.append(os.path.join(os.path.dirname(os.path.dirname(SRC_DIR)),
-                             'shiboken2', 'tests'))
+                             'shiboken6', 'tests'))
 from shiboken_paths import (get_dir_env_var, get_build_dir, add_python_dirs,
                             add_lib_dirs, shiboken_paths)
 
@@ -68,7 +68,7 @@ def _get_qt_lib_dir():
 
 def _init_test_paths(shiboken_tests=False, testbindings_module=False):
     """Sets the correct import paths (Python modules and C++ library paths)
-       for PySide tests and shiboken2 tests using depending on the environment
+       for PySide tests and shiboken6 tests using depending on the environment
        variables BUILD_DIR and QT_DIR pointing to the build directory and
        Qt directory, respectively."""
     src_dir = os.path.dirname(os.path.abspath(__file__))
@@ -99,6 +99,6 @@ def init_test_paths(testbindings_module=False):
 
 
 def init_all_test_paths():
-    """Sets the correct import paths for PySide2 and shiboken2 tests
+    """Sets the correct import paths for PySide2 and shiboken6 tests
        (for registry checking only)."""
     _init_test_paths(True, True)
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt
index 361f7d541..e969e13c9 100644
--- a/sources/pyside2/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt
@@ -68,7 +68,7 @@ endif()
 
 make_path(testbinding_include_dirs  ${pyside2_BINARY_DIR}
                                     ${CMAKE_CURRENT_SOURCE_DIR}
-                                    ${CMAKE_CURRENT_SOURCE_DIR}/../../../shiboken2/libshiboken
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/../../../shiboken6/libshiboken
                                     ${CMAKE_CURRENT_SOURCE_DIR}/../../PySide2
                                     ${CMAKE_CURRENT_SOURCE_DIR}/../../libpyside
                                     ${QT_INCLUDE_DIR}
@@ -83,7 +83,7 @@ make_path(testbinding_typesystem_path ${pyside2_SOURCE_DIR}
 add_custom_command(
 OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
         BYPRODUCTS ${testbinding_SRC}
-        COMMAND Shiboken2::shiboken2 ${GENERATOR_EXTRA_FLAGS}
+        COMMAND Shiboken6::shiboken6 ${GENERATOR_EXTRA_FLAGS}
         ${CMAKE_CURRENT_SOURCE_DIR}/pysidetest_global.h
         --include-paths=${testbinding_include_dirs}
         ${shiboken_framework_include_dirs_option}
@@ -111,7 +111,7 @@ set_target_properties(pysidetest PROPERTIES
                       DEFINE_SYMBOL BUILD_PYSIDETEST)
 
 target_link_libraries(pysidetest
-                      Shiboken2::libshiboken
+                      Shiboken6::libshiboken
                       ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES}
@@ -134,7 +134,7 @@ target_link_libraries(testbinding
                       pysidetest
                       pyside2
                       ${TESTBINDING_PYTHON_LIBS}
-                      Shiboken2::libshiboken
+                      Shiboken6::libshiboken
                       ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}
                       ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES})
diff --git a/sources/pyside2/tests/pysidetest/bug_1016.py b/sources/pyside2/tests/pysidetest/bug_1016.py
index 9f035e0e1..234bfe0e5 100644
--- a/sources/pyside2/tests/pysidetest/bug_1016.py
+++ b/sources/pyside2/tests/pysidetest/bug_1016.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from init_paths import init_test_paths
 init_test_paths(True)
 
-import shiboken2
+import shiboken6
 from testbinding import *
 
 class TestBug1016 (unittest.TestCase):
diff --git a/sources/pyside2/tests/registry/init_platform.py b/sources/pyside2/tests/registry/init_platform.py
index e80c3b69f..86548d7e5 100644
--- a/sources/pyside2/tests/registry/init_platform.py
+++ b/sources/pyside2/tests/registry/init_platform.py
@@ -104,7 +104,7 @@ if not os.path.exists(os.path.join(all_build_dir, look_for)):
     sys.exit(1)
 
 pyside_build_dir = os.path.join(all_build_dir, "pyside2")
-shiboken_build_dir = os.path.join(all_build_dir, "shiboken2")
+shiboken_build_dir = os.path.join(all_build_dir, "shiboken6")
 
 # now we compute all paths:
 def set_ospaths(build_dir):
@@ -113,11 +113,11 @@ def set_ospaths(build_dir):
     old_val = os.environ.get(ospath_var, "")
     lib_path = [os.path.join(build_dir, "pyside2", "libpyside"),
                 os.path.join(build_dir, "pyside2", "tests", "pysidetest"),
-                os.path.join(build_dir, "shiboken2", "tests", "libminimal"),
-                os.path.join(build_dir, "shiboken2", "tests", "libsample"),
-                os.path.join(build_dir, "shiboken2", "tests", "libother"),
-                os.path.join(build_dir, "shiboken2", "tests", "libsmart"),
-                os.path.join(build_dir, "shiboken2", "libshiboken")]
+                os.path.join(build_dir, "shiboken6", "tests", "libminimal"),
+                os.path.join(build_dir, "shiboken6", "tests", "libsample"),
+                os.path.join(build_dir, "shiboken6", "tests", "libother"),
+                os.path.join(build_dir, "shiboken6", "tests", "libsmart"),
+                os.path.join(build_dir, "shiboken6", "libshiboken")]
     ospath = ps.join(lib_path + old_val.split(ps))
     os.environ[ospath_var] = ospath
 
@@ -136,9 +136,9 @@ import testbinding
 all_modules.append("testbinding")
 
 # Note: This is not the shiboken dir as usual, but the binary.
-import shiboken2 as Shiboken
+import shiboken6 as Shiboken
 Shiboken.__name__ = "Shiboken"
-sys.modules["Shiboken"] = sys.modules.pop("shiboken2")
+sys.modules["Shiboken"] = sys.modules.pop("shiboken6")
 all_modules.append("Shiboken")
 
 # 'sample/smart' are needed by 'other', so import them first.
diff --git a/sources/pyside2/tests/registry/scrape_testresults.py b/sources/pyside2/tests/registry/scrape_testresults.py
index c5c0e8689..e0f451d10 100644
--- a/sources/pyside2/tests/registry/scrape_testresults.py
+++ b/sources/pyside2/tests/registry/scrape_testresults.py
@@ -344,7 +344,7 @@ if __name__ == "__main__":
             Enforces evaluation when a scan did not complete yet.
 
             For more information, see the file
-                sources/shiboken2/libshiboken/signature_doc.rst
+                sources/shiboken6/libshiboken/signature_doc.rst
             """))
     subparsers = parser.add_subparsers(dest="command", metavar="", title="required argument")
     # create the parser for the "scan" command
diff --git a/sources/pyside2/tests/support/voidptr_test.py b/sources/pyside2/tests/support/voidptr_test.py
index 367d250da..2b7b713f9 100644
--- a/sources/pyside2/tests/support/voidptr_test.py
+++ b/sources/pyside2/tests/support/voidptr_test.py
@@ -34,7 +34,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from init_paths import init_test_paths
 init_test_paths(False)
 
-import shiboken2 as shiboken
+import shiboken6 as shiboken
 from PySide2.support import VoidPtr
 from PySide2.QtCore import QByteArray