Merge branch 6.3 into wip/6.3_pypy

Change-Id: I65d844e363605885d76cef9c803a6be5cf3793f2

4 files changed, 14 insertions, 12 deletions

diff --git a/sources/pyside6/libpyside/pysideproperty.cpp b/sources/pyside6/libpyside/pysideproperty.cpp
index 5e68253d8..b9f788b61 100644
--- a/sources/pyside6/libpyside/pysideproperty.cpp
+++ b/sources/pyside6/libpyside/pysideproperty.cpp
@@ -103,6 +103,7 @@ static PyType_Slot PySidePropertyType_slots[] = {
     {Py_tp_init, reinterpret_cast<void *>(qpropertyTpInit)},
     {Py_tp_new, reinterpret_cast<void *>(qpropertyTpNew)},
     {Py_tp_getset, PySidePropertyType_getset},
+    {Py_tp_del, reinterpret_cast<void *>(PyObject_GC_Del)},
     {0, nullptr}
 };
 
@@ -271,6 +272,7 @@ static void qpropertyDeAlloc(PyObject *self)
         // This was not needed before Python 3.8 (Python issue 35810)
         Py_DECREF(Py_TYPE(self));
     }
+    PyObject_GC_UnTrack(self);
     Py_TYPE(self)->tp_free(self);
 }
 
diff --git a/tools/example_gallery/main.py b/tools/example_gallery/main.py
index 291514ab0..3dab597f2 100644
--- a/tools/example_gallery/main.py
+++ b/tools/example_gallery/main.py
@@ -180,10 +180,10 @@ def get_code_tabs(files, project_dir):
 
 
 def get_header_title(example_dir):
-    _title = str(example_dir)
     _index = example_dir.parts.index("examples")
-    url_name = "/".join(example_dir.parts[_index + 1:])
-    url = f"{BASE_URL}/{url_name}"
+    rel_path = "/".join(example_dir.parts[_index:])
+    _title = rel_path
+    url = f"{BASE_URL}/{rel_path}"
     return (
         "..\n    This file was auto-generated by the 'examples_gallery' "
         "script.\n    Any change will be lost!\n\n"
@@ -198,7 +198,7 @@ if __name__ == "__main__":
     DIR = Path(__file__).parent
     EXAMPLES_DOC = Path(f"{DIR}/../../sources/pyside6/doc/examples").resolve()
     EXAMPLES_DIR = Path(f"{DIR}/../../examples/").resolve()
-    BASE_URL = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree/examples"
+    BASE_URL = "https://code.qt.io/cgit/pyside/pyside-setup.git/tree"
     columns = 5
     gallery = ""
 
diff --git a/tools/snippets_translate/handlers.py b/tools/snippets_translate/handlers.py
index 26633fc50..642db24cb 100644
--- a/tools/snippets_translate/handlers.py
+++ b/tools/snippets_translate/handlers.py
@@ -340,7 +340,7 @@ def handle_constructor_default_values(x):
             if arg.startswith("Q"):
                 class_name = arg.split("(")[0]
                 content = arg.replace(class_name, "")[1:-1]
-                return_values += f"    {class_name}.__init__(self, {content})\n"
+                return_values += f"    super().__init__({content})\n"
             elif arg:
                 var_name = arg.split("(")[0]
                 content = PARENTHESES_NONEMPTY_CONTENT_PATTERN.search(arg).group(1)
@@ -350,7 +350,7 @@ def handle_constructor_default_values(x):
         if arg.startswith("Q"):
             class_name = arg.split("(")[0]
             content = arg.replace(class_name, "")[1:-1]
-            return f"    {class_name}.__init__(self, {content})"
+            return f"    super().__init__({content})"
         elif arg:
             var_name = arg.split("(")[0]
             match = PARENTHESES_NONEMPTY_CONTENT_PATTERN.search(arg)
diff --git a/tools/snippets_translate/tests/test_converter.py b/tools/snippets_translate/tests/test_converter.py
index 0057159c3..d47ab9ef2 100644
--- a/tools/snippets_translate/tests/test_converter.py
+++ b/tools/snippets_translate/tests/test_converter.py
@@ -326,24 +326,24 @@ def test_constuctors():
 def test_inheritance_init():
     assert (
         st(": QClass(fun(re, 1, 2), parent), a(1)")
-        == "    QClass.__init__(self, fun(re, 1, 2), parent)\n    self.a = 1"
+        == "    super().__init__(fun(re, 1, 2), parent)\n    self.a = 1"
     )
     assert (
         st(":   QQmlNdefRecord(copyFooRecord(record), parent)")
-        == "    QQmlNdefRecord.__init__(self, copyFooRecord(record), parent)"
+        == "    super().__init__(copyFooRecord(record), parent)"
     )
     assert (
         st("    : QWidget(parent), helper(helper)")
-        == "    QWidget.__init__(self, parent)\n    self.helper = helper"
+        == "    super().__init__(parent)\n    self.helper = helper"
     )
-    assert st("   : QWidget(parent)") == "    QWidget.__init__(self, parent)"
+    assert st("   : QWidget(parent)") == "    super().__init__(parent)"
     assert (
         st(": a(0), bB(99), cC2(1), p_S(10),")
         == "    self.a = 0\n    self.bB = 99\n    self.cC2 = 1\n    self.p_S = 10"
     )
     assert (
         st(": QAbstractFileEngineIterator(nameFilters, filters), index(0) ")
-        == "    QAbstractFileEngineIterator.__init__(self, nameFilters, filters)\n    self.index = 0"
+        == "    super().__init__(nameFilters, filters)\n    self.index = 0"
     )
     assert (
         st(": m_document(doc), m_text(text)") == "    self.m_document = doc\n    self.m_text = text"
@@ -353,7 +353,7 @@ def test_inheritance_init():
         st(": option->palette.color(QPalette::Mid);")
         == "    self.option.palette.color = QPalette.Mid"
     )
-    assert st(": QSqlResult(driver) {}") == "    QSqlResult.__init__(self, driver)"
+    assert st(": QSqlResult(driver) {}") == "    super().__init__(driver)"
 
 
 def test_arrays():