Rename PySide2 to PySide6

Adapt CMake files, build scripts, tests and examples.

Task-number: PYSIDE-904
Change-Id: I845f7b006e9ad274fed5444ec4c1f9dbe176ff88
Reviewed-by: Christian Tismer <tismer@stackless.com>

6 files changed, 91 insertions, 91 deletions

diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__feature__.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__feature__.py
index ece3d2edb..6cedcc1ec 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__feature__.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/__feature__.py
@@ -129,11 +129,11 @@ def _import(name, *args, **kwargs):
             pyside_feature_dict["rlcompleter"] = flag
 
         # Initialize feature (multiple times allowed) and clear cache.
-        sys.modules["PySide2.QtCore"].__init_feature__()
+        sys.modules["PySide6.QtCore"].__init_feature__()
         return sys.modules["__feature__"]
 
-    if name.split(".")[0] == "PySide2":
-        # This is a module that imports PySide2.
+    if name.split(".")[0] == "PySide6":
+        # This is a module that imports PySide6.
         flag = existing if isinstance(existing, int) else 0
     else:
         # This is some other module. Ignore it in switching.
@@ -147,7 +147,7 @@ def __init__():
     global _is_initialized
     if not _is_initialized:
         # use _one_ recursive import...
-        import PySide2.QtCore
+        import PySide6.QtCore
         # Initialize all prior imported modules
         for name in sys.modules:
             pyside_feature_dict.setdefault(name, -1)
@@ -165,7 +165,7 @@ def set_selection(select_id, mod_name=None):
     if isinstance(select_id, int):
         flag = select_id & 255
     pyside_feature_dict[mod_name] = flag
-    sys.modules["PySide2.QtCore"].__init_feature__()
+    sys.modules["PySide6.QtCore"].__init_feature__()
     return _current_selection(flag)
 
 
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py
index 3dbc2e011..7b1d4927e 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/importhandler.py
@@ -51,11 +51,11 @@ because the implementation of deprecated functions should be visible
 to the users (in the hope they don't use it any longer <wink>).
 
 As a first approach, the function finish_import redirects to
-PySide2/support/deprecated.py . There can come other extensions as well.
+PySide6/support/deprecated.py . There can come other extensions as well.
 """
 
 try:
-    from PySide2.support import deprecated
+    from PySide6.support import deprecated
     have_deprecated = True
 except ImportError:
     have_deprecated = False
@@ -63,7 +63,7 @@ except ImportError:
 
 # called by loader.py from signature.cpp
 def finish_import(module):
-    if have_deprecated and module.__name__.startswith("PySide2."):
+    if have_deprecated and module.__name__.startswith("PySide6."):
         try:
             name = "fix_for_" + module.__name__.split(".")[1]
             func = getattr(deprecated, name, None)
@@ -89,7 +89,7 @@ was much less appealing.
 Reason:
 If someone executes as the first PySide statement
 
-    from PySide2 import QtGui
+    from PySide6 import QtGui
 
 then this import is already running. We can see the other imports like the
 diverse initializations and QtCore, because it is triggered by import of
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
index dcbdd657c..06144836b 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/lib/enum_sig.py
@@ -67,7 +67,7 @@ class ExactEnumerator(object):
         global EnumType
         try:
             # Lazy import
-            from PySide2.QtCore import Qt
+            from PySide6.QtCore import Qt
             EnumType = type(Qt.Key)
         except ImportError:
             EnumType = None
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
index 49c6439b7..766ff2437 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/loader.py
@@ -50,7 +50,7 @@ to make sure that the functions are available when needed.
 This is meanwhile necessary to make the '__doc__' attribute work correctly.
 
 It does not mean that everything is initialized in advance. Only the modules
-are loaded completely after 'import PySide2'.
+are loaded completely after 'import PySide6'.
 
 This version uses both a normal directory, but has also an embedded ZIP file
 as a fallback solution. The ZIP file is generated by 'embedding_generator.py'
@@ -173,23 +173,23 @@ put_into_package(shibokensupport.signature, inspect, "inspect")
 
 
 def move_into_pyside_package():
-    import PySide2
+    import PySide6
     try:
-        import PySide2.support
+        import PySide6.support
     except ModuleNotFoundError:
-        PySide2.support = types.ModuleType("PySide2.support")
-    put_into_package(PySide2.support, __feature__)
-    put_into_package(PySide2.support, signature)
-    put_into_package(PySide2.support.signature, mapping)
-    put_into_package(PySide2.support.signature, errorhandler)
-    put_into_package(PySide2.support.signature, layout)
-    put_into_package(PySide2.support.signature, lib)
-    put_into_package(PySide2.support.signature, parser)
-    put_into_package(PySide2.support.signature, importhandler)
-    put_into_package(PySide2.support.signature.lib, enum_sig)
-
-    put_into_package(None if orig_typing else PySide2.support.signature, typing)
-    put_into_package(PySide2.support.signature, inspect)
+        PySide6.support = types.ModuleType("PySide6.support")
+    put_into_package(PySide6.support, __feature__)
+    put_into_package(PySide6.support, signature)
+    put_into_package(PySide6.support.signature, mapping)
+    put_into_package(PySide6.support.signature, errorhandler)
+    put_into_package(PySide6.support.signature, layout)
+    put_into_package(PySide6.support.signature, lib)
+    put_into_package(PySide6.support.signature, parser)
+    put_into_package(PySide6.support.signature, importhandler)
+    put_into_package(PySide6.support.signature.lib, enum_sig)
+
+    put_into_package(None if orig_typing else PySide6.support.signature, typing)
+    put_into_package(PySide6.support.signature, inspect)
 
 from shibokensupport.signature import mapping
 from shibokensupport.signature import errorhandler
@@ -199,16 +199,16 @@ from shibokensupport.signature import parser
 from shibokensupport.signature import importhandler
 from shibokensupport.signature.lib import enum_sig
 
-if "PySide2" in sys.modules:
-    # We publish everything under "PySide2.support.signature", again.
+if "PySide6" in sys.modules:
+    # We publish everything under "PySide6.support.signature", again.
     move_into_pyside_package()
     # PYSIDE-1019: Modify `__import__` to be `__feature__` aware.
     # __feature__ is already in sys.modules, so this is actually no import
     try:
-        import PySide2.support.__feature__
-        sys.modules["__feature__"] = PySide2.support.__feature__
-        PySide2.support.__feature__.original_import = __builtins__["__import__"]
-        __builtins__["__import__"] = PySide2.support.__feature__._import
+        import PySide6.support.__feature__
+        sys.modules["__feature__"] = PySide6.support.__feature__
+        PySide6.support.__feature__.original_import = __builtins__["__import__"]
+        __builtins__["__import__"] = PySide6.support.__feature__._import
         # Maybe we should optimize that and change `__import__` from C, instead?
     except ModuleNotFoundError:
         print("__feature__ could not be imported. "
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
index 43be5b95f..46da17a47 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/mapping.py
@@ -198,10 +198,10 @@ class Reloader(object):
         candidates = list(mod_name for mod_name in sys.modules.copy()
                           if self.module_valid(sys.modules[mod_name]))
         for mod_name in candidates:
-            # 'top' is PySide2 when we do 'import PySide.QtCore'
+            # 'top' is PySide6 when we do 'import PySide.QtCore'
             # or Shiboken if we do 'import Shiboken'.
             # Convince yourself that these two lines below have the same
-            # global effect as "import Shiboken" or "import PySide2.QtCore".
+            # global effect as "import Shiboken" or "import PySide6.QtCore".
             top = __import__(mod_name)
             g[top.__name__] = top
             proc_name = "init_" + mod_name.replace(".", "_")
@@ -331,7 +331,7 @@ type_map.update({
 
 type_map.update({
     # Handling variables that are returned, eventually as Tuples:
-    "PySide2.QtQml.atomic[bool]": ResultVariable(bool),  # QmlIncubationController::incubateWhile()
+    "PySide6.QtQml.atomic[bool]": ResultVariable(bool),  # QmlIncubationController::incubateWhile()
     "bool*"         : ResultVariable(bool),
     "float*"        : ResultVariable(float),
     "int*"          : ResultVariable(int),
@@ -432,13 +432,13 @@ def init_smart():
 
 
 # The PySide Part
-def init_PySide2_QtCore():
-    from PySide2.QtCore import Qt, QUrl, QDir
-    from PySide2.QtCore import QRect, QSize, QPoint, QLocale, QByteArray
-    from PySide2.QtCore import QMarginsF # 5.9
+def init_PySide6_QtCore():
+    from PySide6.QtCore import Qt, QUrl, QDir
+    from PySide6.QtCore import QRect, QSize, QPoint, QLocale, QByteArray
+    from PySide6.QtCore import QMarginsF # 5.9
     try:
         # seems to be not generated by 5.9 ATM.
-        from PySide2.QtCore import Connection
+        from PySide6.QtCore import Connection
     except ImportError:
         pass
     type_map.update({
@@ -447,19 +447,19 @@ def init_PySide2_QtCore():
         "'g'": "g",
         "4294967295UL": 4294967295, # 5.6, RHEL 6.6
         "CheckIndexOption.NoOption": Instance(
-            "PySide2.QtCore.QAbstractItemModel.CheckIndexOptions.NoOption"), # 5.11
+            "PySide6.QtCore.QAbstractItemModel.CheckIndexOptions.NoOption"), # 5.11
         "DescriptorType(-1)": int,  # Native handle of QSocketDescriptor
         "false": False,
-        "list of QAbstractAnimation": typing.List[PySide2.QtCore.QAbstractAnimation],
+        "list of QAbstractAnimation": typing.List[PySide6.QtCore.QAbstractAnimation],
         "long long": int,
         "size_t": int,
         "NULL": None, # 5.6, MSVC
         "nullptr": None, # 5.9
         "PyByteArray": bytearray,
         "PyBytes": bytes,
-        "QDeadlineTimer(QDeadlineTimer.Forever)": Instance("PySide2.QtCore.QDeadlineTimer"),
-        "PySide2.QtCore.QUrl.ComponentFormattingOptions":
-            PySide2.QtCore.QUrl.ComponentFormattingOption, # mismatch option/enum, why???
+        "QDeadlineTimer(QDeadlineTimer.Forever)": Instance("PySide6.QtCore.QDeadlineTimer"),
+        "PySide6.QtCore.QUrl.ComponentFormattingOptions":
+            PySide6.QtCore.QUrl.ComponentFormattingOption, # mismatch option/enum, why???
         "PyUnicode": typing.Text,
         "Q_NULLPTR": None,
         "QDir.Filters(AllEntries | NoDotAndDotDot)": Instance(
@@ -472,8 +472,8 @@ def init_PySide2_QtCore():
         "QGenericArgument(NULL)": ellipsis, # 5.6, MSVC
         "QGenericArgument(nullptr)": ellipsis, # 5.10
         "QGenericArgument(Q_NULLPTR)": ellipsis,
-        "QJsonObject": typing.Dict[str, PySide2.QtCore.QJsonValue],
-        "QModelIndex()": Invalid("PySide2.QtCore.QModelIndex"), # repr is btw. very wrong, fix it?!
+        "QJsonObject": typing.Dict[str, PySide6.QtCore.QJsonValue],
+        "QModelIndex()": Invalid("PySide6.QtCore.QModelIndex"), # repr is btw. very wrong, fix it?!
         "QModelIndexList": ModelIndexList,
         "QModelIndexList": ModelIndexList,
         "QString()": "",
@@ -490,7 +490,7 @@ def init_PySide2_QtCore():
     })
     try:
         type_map.update({
-            "PySide2.QtCore.QMetaObject.Connection": PySide2.QtCore.Connection, # wrong!
+            "PySide6.QtCore.QMetaObject.Connection": PySide6.QtCore.Connection, # wrong!
         })
     except AttributeError:
         # this does not exist on 5.9 ATM.
@@ -498,25 +498,25 @@ def init_PySide2_QtCore():
     return locals()
 
 
-def init_PySide2_QtConcurrent():
+def init_PySide6_QtConcurrent():
     type_map.update({
-        "PySide2.QtCore.QFuture[QString]":
-        PySide2.QtConcurrent.QFutureQString,
-        "PySide2.QtCore.QFuture[void]":
-        PySide2.QtConcurrent.QFutureVoid,
+        "PySide6.QtCore.QFuture[QString]":
+        PySide6.QtConcurrent.QFutureQString,
+        "PySide6.QtCore.QFuture[void]":
+        PySide6.QtConcurrent.QFutureVoid,
     })
     return locals()
 
 
-def init_PySide2_QtGui():
-    from PySide2.QtGui import QPageLayout, QPageSize # 5.12 macOS
+def init_PySide6_QtGui():
+    from PySide6.QtGui import QPageLayout, QPageSize # 5.12 macOS
     type_map.update({
         "0.0f": 0.0,
         "1.0f": 1.0,
         "GL_COLOR_BUFFER_BIT": GL_COLOR_BUFFER_BIT,
         "GL_NEAREST": GL_NEAREST,
         "int32_t": int,
-        "QPixmap()": Default("PySide2.QtGui.QPixmap"), # can't create without qApp
+        "QPixmap()": Default("PySide6.QtGui.QPixmap"), # can't create without qApp
         "QPlatformSurface*": int, # a handle
         "QVector< QTextLayout.FormatRange >()": [], # do we need more structure?
         "uint32_t": int,
@@ -526,9 +526,9 @@ def init_PySide2_QtGui():
     return locals()
 
 
-def init_PySide2_QtWidgets():
-    from PySide2.QtWidgets import QWidget, QMessageBox, QStyleOption, QStyleHintReturn, QStyleOptionComplex
-    from PySide2.QtWidgets import QGraphicsItem, QStyleOptionGraphicsItem # 5.9
+def init_PySide6_QtWidgets():
+    from PySide6.QtWidgets import QWidget, QMessageBox, QStyleOption, QStyleHintReturn, QStyleOptionComplex
+    from PySide6.QtWidgets import QGraphicsItem, QStyleOptionGraphicsItem # 5.9
     type_map.update({
         "QMessageBox.StandardButtons(Yes | No)": Instance(
             "QMessageBox.StandardButtons(QMessageBox.Yes | QMessageBox.No)"),
@@ -539,13 +539,13 @@ def init_PySide2_QtWidgets():
         "SO_Default": QStyleOption.SO_Default,
         "static_cast<Qt.MatchFlags>(Qt.MatchExactly|Qt.MatchCaseSensitive)": Instance(
             "Qt.MatchFlags(Qt.MatchExactly | Qt.MatchCaseSensitive)"),
-        "Type": PySide2.QtWidgets.QListWidgetItem.Type,
+        "Type": PySide6.QtWidgets.QListWidgetItem.Type,
     })
     return locals()
 
 
-def init_PySide2_QtSql():
-    from PySide2.QtSql import QSqlDatabase
+def init_PySide6_QtSql():
+    from PySide6.QtSql import QSqlDatabase
     type_map.update({
         "QLatin1String(defaultConnection)": QSqlDatabase.defaultConnection,
         "QVariant.Invalid": Invalid("Variant"), # not sure what I should create, here...
@@ -553,12 +553,12 @@ def init_PySide2_QtSql():
     return locals()
 
 
-def init_PySide2_QtNetwork():
-    from PySide2.QtNetwork import QNetworkRequest
+def init_PySide6_QtNetwork():
+    from PySide6.QtNetwork import QNetworkRequest
     best_structure = typing.OrderedDict if getattr(typing, "OrderedDict", None) else typing.Dict
     type_map.update({
-        "QMultiMap[PySide2.QtNetwork.QSsl.AlternativeNameEntryType, QString]":
-            best_structure[PySide2.QtNetwork.QSsl.AlternativeNameEntryType, typing.List[str]],
+        "QMultiMap[PySide6.QtNetwork.QSsl.AlternativeNameEntryType, QString]":
+            best_structure[PySide6.QtNetwork.QSsl.AlternativeNameEntryType, typing.List[str]],
         "DefaultTransferTimeoutConstant":
             QNetworkRequest.TransferTimeoutConstant,
         "QNetworkRequest.DefaultTransferTimeoutConstant":
@@ -568,28 +568,28 @@ def init_PySide2_QtNetwork():
     return locals()
 
 
-def init_PySide2_QtXmlPatterns():
-    from PySide2.QtXmlPatterns import QXmlName
+def init_PySide6_QtXmlPatterns():
+    from PySide6.QtXmlPatterns import QXmlName
     type_map.update({
-        "QXmlName.NamespaceCode": Missing("PySide2.QtXmlPatterns.QXmlName.NamespaceCode"),
-        "QXmlName.PrefixCode": Missing("PySide2.QtXmlPatterns.QXmlName.PrefixCode"),
+        "QXmlName.NamespaceCode": Missing("PySide6.QtXmlPatterns.QXmlName.NamespaceCode"),
+        "QXmlName.PrefixCode": Missing("PySide6.QtXmlPatterns.QXmlName.PrefixCode"),
     })
     return locals()
 
 
-def init_PySide2_QtMultimedia():
-    import PySide2.QtMultimediaWidgets
+def init_PySide6_QtMultimedia():
+    import PySide6.QtMultimediaWidgets
     # Check if foreign import is valid. See mapping.py in shiboken6.
-    check_module(PySide2.QtMultimediaWidgets)
+    check_module(PySide6.QtMultimediaWidgets)
     type_map.update({
-        "QGraphicsVideoItem": PySide2.QtMultimediaWidgets.QGraphicsVideoItem,
+        "QGraphicsVideoItem": PySide6.QtMultimediaWidgets.QGraphicsVideoItem,
         "qint64": int,
-        "QVideoWidget": PySide2.QtMultimediaWidgets.QVideoWidget,
+        "QVideoWidget": PySide6.QtMultimediaWidgets.QVideoWidget,
     })
     return locals()
 
 
-def init_PySide2_QtOpenGL():
+def init_PySide6_QtOpenGL():
     type_map.update({
         "GLbitfield": int,
         "GLenum": int,
@@ -600,7 +600,7 @@ def init_PySide2_QtOpenGL():
     return locals()
 
 
-def init_PySide2_QtQml():
+def init_PySide6_QtQml():
     type_map.update({
         "QJSValueList()": [],
         "QVariantHash()": typing.Dict[str, Variant],    # from 5.9
@@ -608,39 +608,39 @@ def init_PySide2_QtQml():
     return locals()
 
 
-def init_PySide2_QtQuick():
+def init_PySide6_QtQuick():
     type_map.update({
-        "PySide2.QtQuick.QSharedPointer[PySide2.QtQuick.QQuickItemGrabResult]":
-            PySide2.QtQuick.QQuickItemGrabResult,
+        "PySide6.QtQuick.QSharedPointer[PySide6.QtQuick.QQuickItemGrabResult]":
+            PySide6.QtQuick.QQuickItemGrabResult,
         "UnsignedShortType": int,
     })
     return locals()
 
 
-def init_PySide2_QtScript():
+def init_PySide6_QtScript():
     type_map.update({
         "QScriptValueList()": [],
     })
     return locals()
 
 
-def init_PySide2_QtTest():
+def init_PySide6_QtTest():
     type_map.update({
-        "PySide2.QtTest.QTest.PySideQTouchEventSequence": PySide2.QtTest.QTest.QTouchEventSequence,
-        "PySide2.QtTest.QTouchEventSequence": PySide2.QtTest.QTest.QTouchEventSequence,
+        "PySide6.QtTest.QTest.PySideQTouchEventSequence": PySide6.QtTest.QTest.QTouchEventSequence,
+        "PySide6.QtTest.QTouchEventSequence": PySide6.QtTest.QTest.QTouchEventSequence,
     })
     return locals()
 
 # from 5.6, MSVC
-def init_PySide2_QtWinExtras():
+def init_PySide6_QtWinExtras():
     type_map.update({
         "QList< QWinJumpListItem* >()": [],
     })
     return locals()
 
 # from 5.12, macOS
-def init_PySide2_QtDataVisualization():
-    from PySide2.QtDataVisualization import QtDataVisualization
+def init_PySide6_QtDataVisualization():
+    from PySide6.QtDataVisualization import QtDataVisualization
     QtDataVisualization.QBarDataRow = typing.List[QtDataVisualization.QBarDataItem]
     QtDataVisualization.QBarDataArray = typing.List[QtDataVisualization.QBarDataRow]
     QtDataVisualization.QSurfaceDataRow = typing.List[QtDataVisualization.QSurfaceDataItem]
diff --git a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
index 6bf78cf95..c5261fc0b 100644
--- a/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
+++ b/sources/shiboken6/shibokenmodule/files.dir/shibokensupport/signature/parser.py
@@ -180,7 +180,7 @@ def get_name(thing):
 
 def _resolve_value(thing, valtype, line):
     if thing in ("0", "None") and valtype:
-        if valtype.startswith("PySide2.") or valtype.startswith("typing."):
+        if valtype.startswith("PySide6.") or valtype.startswith("typing."):
             return None
         map = type_map[valtype]
         # typing.Any: '_SpecialForm' object has no attribute '__name__'
@@ -230,12 +230,12 @@ def to_string(thing):
     return str(thing)
 
 
-matrix_pattern = "PySide2.QtGui.QGenericMatrix"
+matrix_pattern = "PySide6.QtGui.QGenericMatrix"
 
 def handle_matrix(arg):
     n, m, typstr = tuple(map(lambda x:x.strip(), arg.split(",")))
     assert typstr == "float"
-    result = f"PySide2.QtGui.QMatrix{n}x{m}"
+    result = f"PySide6.QtGui.QMatrix{n}x{m}"
     return eval(result, namespace)
 
 
@@ -251,7 +251,7 @@ def lno(level):
 
 def _resolve_type(thing, line, level, var_handler):
     # Capture total replacements, first. Happens in
-    # "PySide2.QtCore.QCborStreamReader.StringResult[PySide2.QtCore.QByteArray]"
+    # "PySide6.QtCore.QCborStreamReader.StringResult[PySide6.QtCore.QByteArray]"
     if thing in type_map:
         return type_map[thing]
     # Now the nested structures are handled.