Some post merge fixup

Author: bluebird75

PySide6-stubs/QtAxContainer.pyi

@@ -71,17 +71,6 @@ class QAxBaseObject(PySide6.QtCore.QObject, PySide6.QtAxContainer.QAxObjectInter
     propertyChanged          : ClassVar[Signal] = ... # propertyChanged(QString)
     signal                   : ClassVar[Signal] = ... # signal(QString,int,void*)
 
-    exception: PySide6.QtCore.Signal
-    propertyChanged: PySide6.QtCore.Signal
-    signal: PySide6.QtCore.Signal
-
-
-
-class QAxBaseWidget(PySide6.QtWidgets.QWidget, PySide6.QtAxContainer.QAxObjectInterface):
-
-    exception: PySide6.QtCore.Signal
-    propertyChanged: PySide6.QtCore.Signal
-    signal: PySide6.QtCore.Signal
 
 class QAxBaseWidget(PySide6.QtWidgets.QWidget, PySide6.QtAxContainer.QAxObjectInterface):
 

PySide6-stubs/QtGui.pyi

@@ -7121,6 +7121,50 @@ class QRhiComputePipeline(PySide6.QtGui.QRhiResource):
 
 class QRhiD3D11InitParams(PySide6.QtGui.QRhiInitParams):
 
+    @overload
+    def __init__(self) -> None: ...
+    @overload
+    def __init__(self, QRhiD3D11InitParams: PySide6.QtGui.QRhiD3D11InitParams) -> None: ...
+
+    @staticmethod
+    def __copy__() -> None: ...
+
+
+class QRhiD3D11NativeHandles(PySide6.QtGui.QRhiNativeHandles):
+
+    @overload
+    def __init__(self) -> None: ...
+    @overload
+    def __init__(self, QRhiD3D11NativeHandles: PySide6.QtGui.QRhiD3D11NativeHandles) -> None: ...
+
+    @staticmethod
+    def __copy__() -> None: ...
+
+
+class QRhiD3D12InitParams(PySide6.QtGui.QRhiInitParams):
+
+    @overload
+    def __init__(self) -> None: ...
+    @overload
+    def __init__(self, QRhiD3D12InitParams: PySide6.QtGui.QRhiD3D12InitParams) -> None: ...
+
+    @staticmethod
+    def __copy__() -> None: ...
+
+
+class QRhiD3D12NativeHandles(PySide6.QtGui.QRhiNativeHandles):
+
+    @overload
+    def __init__(self) -> None: ...
+    @overload
+    def __init__(self, QRhiD3D12NativeHandles: PySide6.QtGui.QRhiD3D12NativeHandles) -> None: ...
+
+    @staticmethod
+    def __copy__() -> None: ...
+
+
+class QRhiDepthStencilClearValue(Shiboken.Object):
+
     @overload
     def __init__(self) -> None: ...
     @overload

PySide6-stubs/QtQml.pyi

@@ -462,15 +462,6 @@ class QQmlContext(PySide6.QtCore.QObject):
         def __copy__() -> None: ...
 
 
-    @overload
-    def __init__(self, parent: PySide6.QtQml.QQmlContext, objParent: Optional[PySide6.QtCore.QObject] = ...) -> None: ...
-    @overload
-    def __init__(self, parent: PySide6.QtQml.QQmlEngine, objParent: Optional[PySide6.QtCore.QObject] = ...) -> None: ...
-
-    @staticmethod
-    def __copy__() -> None: ...
-
-
     @overload
     def __init__(self, parent: PySide6.QtQml.QQmlContext, objParent: Optional[PySide6.QtCore.QObject] = ...) -> None: ...
     @overload