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>

9 files changed, 77 insertions, 77 deletions

diff --git a/examples/opengl/hellogl2.py b/examples/opengl/hellogl2.py
index b12a7b275..fd5d79be3 100644
--- a/examples/opengl/hellogl2.py
+++ b/examples/opengl/hellogl2.py
@@ -55,7 +55,7 @@ from PySide2.QtWidgets import (QApplication, QWidget, QMessageBox, QHBoxLayout,
     QSlider)
 from PySide2.QtOpenGLWidgets import QOpenGLWidget
 
-from shiboken2 import VoidPtr
+from shiboken6 import VoidPtr
 
 try:
     from OpenGL import GL
diff --git a/examples/samplebinding/CMakeLists.txt b/examples/samplebinding/CMakeLists.txt
index f7651e04f..8a2e55d66 100644
--- a/examples/samplebinding/CMakeLists.txt
+++ b/examples/samplebinding/CMakeLists.txt
@@ -70,14 +70,14 @@ macro(pyside2_config option output_var)
 endmacro()
 
 # Query for the shiboken generator path, Python path, include paths and linker flags.
-pyside2_config(--shiboken2-module-path shiboken2_module_path)
-pyside2_config(--shiboken2-generator-path shiboken2_generator_path)
+pyside2_config(--shiboken6-module-path shiboken6_module_path)
+pyside2_config(--shiboken6-generator-path shiboken6_generator_path)
 pyside2_config(--python-include-path python_include_dir)
-pyside2_config(--shiboken2-generator-include-path shiboken_include_dir 1)
-pyside2_config(--shiboken2-module-shared-libraries-cmake shiboken_shared_libraries 0)
+pyside2_config(--shiboken6-generator-include-path shiboken_include_dir 1)
+pyside2_config(--shiboken6-module-shared-libraries-cmake shiboken_shared_libraries 0)
 pyside2_config(--python-link-flags-cmake python_linking_data 0)
 
-set(shiboken_path "${shiboken2_generator_path}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}")
+set(shiboken_path "${shiboken6_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
 if(NOT EXISTS ${shiboken_path})
     message(FATAL_ERROR "Shiboken executable not found at path: ${shiboken_path}")
 endif()
@@ -93,7 +93,7 @@ endif()
 # Enable rpaths so that the built shared libraries find their dependencies.
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH ${shiboken2_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_INSTALL_RPATH ${shiboken6_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 # =============================================================================================
 # !!! End of dubious section.
diff --git a/examples/samplebinding/README.md b/examples/samplebinding/README.md
index e84d1eff4..34f3568f2 100644
--- a/examples/samplebinding/README.md
+++ b/examples/samplebinding/README.md
@@ -139,7 +139,7 @@ For Windows you will also need:
   or all Debug).
 
 The build uses the `pyside2_config.py` file to configure the project
-using the current PySide2/Shiboken2 installation.
+using the current PySide2/Shiboken6 installation.
 
 ### Using CMake
 
@@ -232,5 +232,5 @@ In practice this means the only supported configurations are:
 This is necessary because all the shared libraries in question have to
 link to the same C++ runtime library (`msvcrt.dll` or `msvcrtd.dll`).
 To make the example as self-contained as possible, the shared libraries
-in use (`pyside2.dll`, `shiboken2.dll`) are hard-linked into the build
+in use (`pyside2.dll`, `shiboken6.dll`) are hard-linked into the build
 folder of the application.
diff --git a/examples/scriptableapplication/CMakeLists.txt b/examples/scriptableapplication/CMakeLists.txt
index 8537ed8fb..f9fc25040 100644
--- a/examples/scriptableapplication/CMakeLists.txt
+++ b/examples/scriptableapplication/CMakeLists.txt
@@ -42,20 +42,20 @@ macro(pyside2_config option output_var)
     endif()
 endmacro()
 
-# Query for the shiboken2-generator path, PySide2 path, Python path, include paths and linker flags.
-pyside2_config(--shiboken2-module-path SHIBOKEN2_MODULE_PATH)
-pyside2_config(--shiboken2-generator-path SHIBOKEN2_GENERATOR_PATH)
+# Query for the shiboken6-generator path, PySide2 path, Python path, include paths and linker flags.
+pyside2_config(--shiboken6-module-path SHIBOKEN6_MODULE_PATH)
+pyside2_config(--shiboken6-generator-path SHIBOKEN6_GENERATOR_PATH)
 pyside2_config(--pyside2-path PYSIDE2_PATH)
 
 pyside2_config(--python-include-path PYTHON_INCLUDE_DIR)
-pyside2_config(--shiboken2-generator-include-path SHIBOKEN2_GENERATOR_INCLUDE_DIR 1)
+pyside2_config(--shiboken6-generator-include-path SHIBOKEN6_GENERATOR_INCLUDE_DIR 1)
 pyside2_config(--pyside2-include-path PYSIDE2_INCLUDE_DIR 1)
 
 pyside2_config(--python-link-flags-cmake PYTHON_LINKING_DATA 0)
-pyside2_config(--shiboken2-module-shared-libraries-cmake SHIBOKEN2_MODULE_SHARED_LIBRARIES 0)
+pyside2_config(--shiboken6-module-shared-libraries-cmake SHIBOKEN6_MODULE_SHARED_LIBRARIES 0)
 pyside2_config(--pyside2-shared-libraries-cmake PYSIDE2_SHARED_LIBRARIES 0)
 
-set(SHIBOKEN_PATH "${SHIBOKEN2_GENERATOR_PATH}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}")
+set(SHIBOKEN_PATH "${SHIBOKEN6_GENERATOR_PATH}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
 
 if(NOT EXISTS ${SHIBOKEN_PATH})
     message(FATAL_ERROR "Shiboken executable not found at path: ${SHIBOKEN_PATH}")
@@ -135,7 +135,7 @@ endforeach()
 # Enable rpaths so that the example can be executed from the build dir.
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH ${PYSIDE2_PATH} ${SHIBOKEN2_MODULE_PATH})
+set(CMAKE_INSTALL_RPATH ${PYSIDE2_PATH} ${SHIBOKEN6_MODULE_PATH})
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 # =============================================================================================
 # !!! End of dubious section.
@@ -152,13 +152,13 @@ target_sources(${PROJECT_NAME} PUBLIC ${SOURCES})
 
 # Apply relevant include and link flags.
 target_include_directories(${PROJECT_NAME} PRIVATE ${PYTHON_INCLUDE_DIR})
-target_include_directories(${PROJECT_NAME} PRIVATE ${SHIBOKEN2_GENERATOR_INCLUDE_DIR})
+target_include_directories(${PROJECT_NAME} PRIVATE ${SHIBOKEN6_GENERATOR_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PYSIDE2_INCLUDE_DIR})
 target_include_directories(${PROJECT_NAME} PRIVATE ${PYSIDE2_ADDITIONAL_INCLUDES})
 target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR})
 
 target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Widgets)
-target_link_libraries(${PROJECT_NAME} PRIVATE ${SHIBOKEN2_MODULE_SHARED_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} PRIVATE ${SHIBOKEN6_MODULE_SHARED_LIBRARIES})
 target_link_libraries(${PROJECT_NAME} PRIVATE ${PYSIDE2_SHARED_LIBRARIES})
 
 # Find and link to the python library.
@@ -191,7 +191,7 @@ if(WIN32)
 
     # Add custom target to hard link PySide2 shared libraries (just like in qmake example), so you
     # don't have to set PATH manually to point to the PySide2 package.
-    set(shared_libraries ${SHIBOKEN2_MODULE_SHARED_LIBRARIES} ${PYSIDE2_SHARED_LIBRARIES})
+    set(shared_libraries ${SHIBOKEN6_MODULE_SHARED_LIBRARIES} ${PYSIDE2_SHARED_LIBRARIES})
     foreach(LIBRARY_PATH ${shared_libraries})
         string(REGEX REPLACE ".lib$" ".dll" LIBRARY_PATH ${LIBRARY_PATH})
         get_filename_component(BASE_NAME ${LIBRARY_PATH} NAME)
diff --git a/examples/scriptableapplication/README.md b/examples/scriptableapplication/README.md
index d359581f1..c388f61de 100644
--- a/examples/scriptableapplication/README.md
+++ b/examples/scriptableapplication/README.md
@@ -50,7 +50,7 @@ For Windows you will also need:
   packages, because none of the supported ones are built with MSVC2008.
 
 Both build options will use the `pyside2_config.py` file to configure the project
-using the current PySide2/Shiboken2 installation (for qmake via pyside2.pri,
+using the current PySide2/Shiboken6 installation (for qmake via pyside2.pri,
 and for CMake via the project CMakeLists.txt).
 
 
@@ -166,5 +166,5 @@ In practice this means the only supported configurations are:
 This is necessary because all the shared libraries in question have to
 link to the same C++ runtime library (`msvcrt.dll` or `msvcrtd.dll`).
 To make the example as self-contained as possible, the shared libraries
-in use (`pyside2.dll`, `shiboken2.dll`) are hard-linked into the build
+in use (`pyside2.dll`, `shiboken6.dll`) are hard-linked into the build
 folder of the application.
diff --git a/examples/scriptableapplication/pyside2.pri b/examples/scriptableapplication/pyside2.pri
index 2da3bc880..d97ad229a 100644
--- a/examples/scriptableapplication/pyside2.pri
+++ b/examples/scriptableapplication/pyside2.pri
@@ -6,11 +6,11 @@ isEmpty(python_interpreter) {
 }
 message(Using python interpreter: $$python_interpreter)
 
-SHIBOKEN2_GENERATOR = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-generator-path)
-isEmpty(SHIBOKEN2_GENERATOR): error(Unable to locate the shiboken2-generator package location)
+SHIBOKEN6_GENERATOR = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-generator-path)
+isEmpty(SHIBOKEN6_GENERATOR): error(Unable to locate the shiboken6-generator package location)
 
-SHIBOKEN2_MODULE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-module-path)
-isEmpty(SHIBOKEN2_MODULE): error(Unable to locate the shiboken2 package location)
+SHIBOKEN6_MODULE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-module-path)
+isEmpty(SHIBOKEN6_MODULE): error(Unable to locate the shiboken6 package location)
 
 PYSIDE2 = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-path)
 isEmpty(PYSIDE2): error(Unable to locate the PySide2 package location)
@@ -21,32 +21,32 @@ isEmpty(PYTHON_INCLUDE): error(Unable to locate the Python include headers direc
 PYTHON_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --python-link-flags-qmake)
 isEmpty(PYTHON_LFLAGS): error(Unable to locate the Python library for linking)
 
-SHIBOKEN2_INCLUDE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-generator-include-path)
-isEmpty(SHIBOKEN2_INCLUDE): error(Unable to locate the shiboken include headers directory)
+SHIBOKEN6_INCLUDE = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-generator-include-path)
+isEmpty(SHIBOKEN6_INCLUDE): error(Unable to locate the shiboken include headers directory)
 
 PYSIDE2_INCLUDE = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-include-path)
 isEmpty(PYSIDE2_INCLUDE): error(Unable to locate the PySide2 include headers directory)
 
-SHIBOKEN2_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-module-qmake-lflags)
-isEmpty(SHIBOKEN2_LFLAGS): error(Unable to locate the shiboken libraries for linking)
+SHIBOKEN6_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-module-qmake-lflags)
+isEmpty(SHIBOKEN6_LFLAGS): error(Unable to locate the shiboken libraries for linking)
 
 PYSIDE2_LFLAGS = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-qmake-lflags)
 isEmpty(PYSIDE2_LFLAGS): error(Unable to locate the PySide2 libraries for linking)
 
-SHIBOKEN2_SHARED_LIBRARIES = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken2-module-shared-libraries-qmake)
-isEmpty(SHIBOKEN2_SHARED_LIBRARIES): error(Unable to locate the used shiboken2 module shared libraries)
+SHIBOKEN6_SHARED_LIBRARIES = $$system($$python_interpreter $$PYSIDE_CONFIG --shiboken6-module-shared-libraries-qmake)
+isEmpty(SHIBOKEN6_SHARED_LIBRARIES): error(Unable to locate the used shiboken6 module shared libraries)
 
 PYSIDE2_SHARED_LIBRARIES = $$system($$python_interpreter $$PYSIDE_CONFIG --pyside2-shared-libraries-qmake)
 isEmpty(PYSIDE2_SHARED_LIBRARIES): error(Unable to locate the used PySide2 shared libraries)
 
-INCLUDEPATH += "$$PYTHON_INCLUDE" $$PYSIDE2_INCLUDE $$SHIBOKEN2_INCLUDE
-LIBS += $$PYTHON_LFLAGS $$PYSIDE2_LFLAGS $$SHIBOKEN2_LFLAGS
+INCLUDEPATH += "$$PYTHON_INCLUDE" $$PYSIDE2_INCLUDE $$SHIBOKEN6_INCLUDE
+LIBS += $$PYTHON_LFLAGS $$PYSIDE2_LFLAGS $$SHIBOKEN6_LFLAGS
 !build_pass:message(INCLUDEPATH is $$INCLUDEPATH)
 !build_pass:message(LIBS are $$LIBS)
 
 !build_pass:message(Using $$PYSIDE2)
 
 !win32 {
-    !build_pass:message(RPATH will include $$PYSIDE2 and $$SHIBOKEN2_MODULE)
-    QMAKE_RPATHDIR += $$PYSIDE2 $$SHIBOKEN2_MODULE
+    !build_pass:message(RPATH will include $$PYSIDE2 and $$SHIBOKEN6_MODULE)
+    QMAKE_RPATHDIR += $$PYSIDE2 $$SHIBOKEN6_MODULE
 }
diff --git a/examples/scriptableapplication/scriptableapplication.pro b/examples/scriptableapplication/scriptableapplication.pro
index 8ebab9476..067d9141f 100644
--- a/examples/scriptableapplication/scriptableapplication.pro
+++ b/examples/scriptableapplication/scriptableapplication.pro
@@ -23,7 +23,7 @@ SHIBOKEN_OPTIONS = --generator-set=shiboken --enable-parent-ctor-heuristic \
 win32:SHIBOKEN_OPTIONS += --avoid-protected-hack
 
 # Prepare the shiboken tool
-QT_TOOL.shiboken.binary = $$system_path($$SHIBOKEN2_GENERATOR/shiboken2)
+QT_TOOL.shiboken.binary = $$system_path($$SHIBOKEN6_GENERATOR/shiboken6)
 qtPrepareTool(SHIBOKEN, shiboken)
 
 # Shiboken run that adds the module wrapper to GENERATED_SOURCES
@@ -61,7 +61,7 @@ win32 {
     hard_link_libraries.CONFIG = no_link target_predeps explicit_dependencies
     hard_link_libraries.output = $$out_dir/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
     hard_link_libraries.commands = mklink /H $$shell_path($$out_dir/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}) $$shell_path(${QMAKE_FILE_IN})
-    hard_link_libraries.input = PYSIDE2_SHARED_LIBRARIES SHIBOKEN2_SHARED_LIBRARIES
+    hard_link_libraries.input = PYSIDE2_SHARED_LIBRARIES SHIBOKEN6_SHARED_LIBRARIES
 }
 
 QMAKE_EXTRA_COMPILERS += shiboken module_wrapper_dummy_command
diff --git a/examples/utils/pyside2_config.py b/examples/utils/pyside2_config.py
index 973410100..f759b11e5 100644
--- a/examples/utils/pyside2_config.py
+++ b/examples/utils/pyside2_config.py
@@ -45,8 +45,8 @@ generic_error = (' Did you forget to activate your virtualenv? Or perhaps'
                  ' you forgot to build / install PySide2 into your currently active Python'
                  ' environment?')
 pyside2_error = 'Unable to locate PySide2.' + generic_error
-shiboken2_module_error = 'Unable to locate shiboken2-module.' + generic_error
-shiboken2_generator_error = 'Unable to locate shiboken2-generator.' + generic_error
+shiboken6_module_error = 'Unable to locate shiboken6-module.' + generic_error
+shiboken6_generator_error = 'Unable to locate shiboken6-generator.' + generic_error
 pyside2_libs_error = 'Unable to locate the PySide2 shared libraries.' + generic_error
 python_link_error = 'Unable to locate the Python library for linking.'
 python_include_error = 'Unable to locate the Python include headers directory.'
@@ -54,14 +54,14 @@ python_include_error = 'Unable to locate the Python include headers directory.'
 options = []
 
 # option, function, error, description
-options.append(("--shiboken2-module-path",
-                lambda: find_shiboken2_module(),
-                shiboken2_module_error,
-                "Print shiboken2 module location"))
-options.append(("--shiboken2-generator-path",
-                lambda: find_shiboken2_generator(),
-                shiboken2_generator_error,
-                "Print shiboken2 generator location"))
+options.append(("--shiboken6-module-path",
+                lambda: find_shiboken6_module(),
+                shiboken6_module_error,
+                "Print shiboken6 module location"))
+options.append(("--shiboken6-generator-path",
+                lambda: find_shiboken6_generator(),
+                shiboken6_generator_error,
+                "Print shiboken6 generator location"))
 options.append(("--pyside2-path", lambda: find_pyside2(), pyside2_error,
                 "Print PySide2 location"))
 
@@ -69,10 +69,10 @@ options.append(("--python-include-path",
                 lambda: get_python_include_path(),
                 python_include_error,
                 "Print Python include path"))
-options.append(("--shiboken2-generator-include-path",
-                lambda: get_package_include_path(Package.shiboken2_generator),
+options.append(("--shiboken6-generator-include-path",
+                lambda: get_package_include_path(Package.shiboken6_generator),
                 pyside2_error,
-                "Print shiboken2 generator include paths"))
+                "Print shiboken6 generator include paths"))
 options.append(("--pyside2-include-path",
                 lambda: get_package_include_path(Package.pyside2),
                 pyside2_error,
@@ -83,19 +83,19 @@ options.append(("--python-link-flags-qmake", lambda: python_link_flags_qmake(),
 options.append(("--python-link-flags-cmake", lambda: python_link_flags_cmake(), python_link_error,
                 "Print python link flags for cmake"))
 
-options.append(("--shiboken2-module-qmake-lflags",
-                lambda: get_package_qmake_lflags(Package.shiboken2_module), pyside2_error,
-                "Print shiboken2 shared library link flags for qmake"))
+options.append(("--shiboken6-module-qmake-lflags",
+                lambda: get_package_qmake_lflags(Package.shiboken6_module), pyside2_error,
+                "Print shiboken6 shared library link flags for qmake"))
 options.append(("--pyside2-qmake-lflags",
                 lambda: get_package_qmake_lflags(Package.pyside2), pyside2_error,
                 "Print PySide2 shared library link flags for qmake"))
 
-options.append(("--shiboken2-module-shared-libraries-qmake",
-                lambda: get_shared_libraries_qmake(Package.shiboken2_module), pyside2_libs_error,
-                "Print paths of shiboken2 shared libraries (.so's, .dylib's, .dll's) for qmake"))
-options.append(("--shiboken2-module-shared-libraries-cmake",
-                lambda: get_shared_libraries_cmake(Package.shiboken2_module), pyside2_libs_error,
-                "Print paths of shiboken2 shared libraries (.so's, .dylib's, .dll's) for cmake"))
+options.append(("--shiboken6-module-shared-libraries-qmake",
+                lambda: get_shared_libraries_qmake(Package.shiboken6_module), pyside2_libs_error,
+                "Print paths of shiboken6 shared libraries (.so's, .dylib's, .dll's) for qmake"))
+options.append(("--shiboken6-module-shared-libraries-cmake",
+                lambda: get_shared_libraries_cmake(Package.shiboken6_module), pyside2_libs_error,
+                "Print paths of shiboken6 shared libraries (.so's, .dylib's, .dll's) for cmake"))
 
 options.append(("--pyside2-shared-libraries-qmake",
                 lambda: get_shared_libraries_qmake(Package.pyside2), pyside2_libs_error,
@@ -111,8 +111,8 @@ for i, (flag, _, _, description) in enumerate(options):
         options_usage += '\n'
 
 usage = """
-Utility to determine include/link options of shiboken2/PySide2 and Python for qmake/CMake projects
-that would like to embed or build custom shiboken2/PySide2 bindings.
+Utility to determine include/link options of shiboken6/PySide2 and Python for qmake/CMake projects
+that would like to embed or build custom shiboken6/PySide2 bindings.
 
 Usage: pyside2_config.py [option]
 Options:
@@ -128,8 +128,8 @@ if option == '-h' or option == '--help':
 
 
 class Package(object):
-    shiboken2_module = 1
-    shiboken2_generator = 2
+    shiboken6_module = 1
+    shiboken6_generator = 2
     pyside2 = 3
 
 
@@ -201,19 +201,19 @@ def find_pyside2():
     return find_package_path("PySide2")
 
 
-def find_shiboken2_module():
-    return find_package_path("shiboken2")
+def find_shiboken6_module():
+    return find_package_path("shiboken6")
 
 
-def find_shiboken2_generator():
-    return find_package_path("shiboken2_generator")
+def find_shiboken6_generator():
+    return find_package_path("shiboken6_generator")
 
 
 def find_package(which_package):
-    if which_package == Package.shiboken2_module:
-        return find_shiboken2_module()
-    if which_package == Package.shiboken2_generator:
-        return find_shiboken2_generator()
+    if which_package == Package.shiboken6_module:
+        return find_shiboken6_module()
+    if which_package == Package.shiboken6_generator:
+        return find_shiboken6_generator()
     if which_package == Package.pyside2:
         return find_pyside2()
     return None
diff --git a/examples/widgetbinding/CMakeLists.txt b/examples/widgetbinding/CMakeLists.txt
index 2966e63b2..4cdfa648e 100644
--- a/examples/widgetbinding/CMakeLists.txt
+++ b/examples/widgetbinding/CMakeLists.txt
@@ -77,17 +77,17 @@ macro(pyside2_config option output_var)
 endmacro()
 
 # Query for the shiboken generator path, Python path, include paths and linker flags.
-pyside2_config(--shiboken2-module-path shiboken2_module_path)
-pyside2_config(--shiboken2-generator-path shiboken2_generator_path)
+pyside2_config(--shiboken6-module-path shiboken6_module_path)
+pyside2_config(--shiboken6-generator-path shiboken6_generator_path)
 pyside2_config(--pyside2-path pyside2_path)
 pyside2_config(--pyside2-include-path pyside2_include_dir 1)
 pyside2_config(--python-include-path python_include_dir)
-pyside2_config(--shiboken2-generator-include-path shiboken_include_dir 1)
-pyside2_config(--shiboken2-module-shared-libraries-cmake shiboken_shared_libraries 0)
+pyside2_config(--shiboken6-generator-include-path shiboken_include_dir 1)
+pyside2_config(--shiboken6-module-shared-libraries-cmake shiboken_shared_libraries 0)
 pyside2_config(--python-link-flags-cmake python_linking_data 0)
 pyside2_config(--pyside2-shared-libraries-cmake pyside2_shared_libraries 0)
 
-set(shiboken_path "${shiboken2_generator_path}/shiboken2${CMAKE_EXECUTABLE_SUFFIX}")
+set(shiboken_path "${shiboken6_generator_path}/shiboken6${CMAKE_EXECUTABLE_SUFFIX}")
 if(NOT EXISTS ${shiboken_path})
     message(FATAL_ERROR "Shiboken executable not found at path: ${shiboken_path}")
 endif()
@@ -103,7 +103,7 @@ endif()
 # Enable rpaths so that the built shared libraries find their dependencies.
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH ${shiboken2_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
+set(CMAKE_INSTALL_RPATH ${shiboken6_module_path} ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 # =============================================================================================
 # !!! End of dubious section.