aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-09-03 10:50:56 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-09-06 11:28:41 +0200
commit5e4a1287c1742f96c5ba3ce0aca75791ce806157 (patch)
tree750e6283f3af3792d6aab6a586691029d8d9998c /sources/pyside6
parentcc7da649aff335ad86c669e3ccb0185738e9d9ae (diff)
shiboken6: Handle hidden methods/"using" correctly
In C++, declaring a non-override method in a class hides all methods of the same name from the base class unless they are made visible by a "using Base::name" specification. Shiboken did not observe this rule; base class methods were added nevertheless, causing problems with code snippets. In addition, there were several places where the recursion for the inherited base class methods was done. Move the collection of inherited base class methods into ShibokenGenerator::getFunctionGroups() and implement proper handling of using declarations. This function then returns the authoritative list of functions to be generated. Remove a few cases from the test. [ChangeLog][shiboken6] The handling of hidden base class member functions and using declarations has been fixed. Fixes: PYSIDE-1653 Change-Id: I62c9ec47617f94098c4a27a557a23bbfeaad805c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6')
-rw-r--r--sources/pyside6/tests/pysidetest/new_inherited_functions_test.py7
1 files changed, 0 insertions, 7 deletions
diff --git a/sources/pyside6/tests/pysidetest/new_inherited_functions_test.py b/sources/pyside6/tests/pysidetest/new_inherited_functions_test.py
index 77efbcb5f..95bf0615f 100644
--- a/sources/pyside6/tests/pysidetest/new_inherited_functions_test.py
+++ b/sources/pyside6/tests/pysidetest/new_inherited_functions_test.py
@@ -79,21 +79,14 @@ new_functions += """
PySide6.QtWidgets.QGestureEvent([]).setAccepted(bool)
# PySide6.QtWidgets.QGraphicsView().render(qPaintDevice,qPoint,qRegion,renderFlags) # QPaintDevice: NotImplementedError
PySide6.QtWidgets.QGridLayout().addWidget(qWidget)
- PySide6.QtWidgets.QHeaderView(orientation).initStyleOption(qStyleOptionFrame)
PySide6.QtWidgets.QInputDialog().open()
PySide6.QtWidgets.QLineEdit().addAction(qAction)
- PySide6.QtWidgets.QListWidget().closePersistentEditor(qModelIndex)
- PySide6.QtWidgets.QListWidget().openPersistentEditor(qModelIndex)
PySide6.QtWidgets.QMessageBox().open()
PySide6.QtWidgets.QPlainTextEdit().find(findStr)
PySide6.QtWidgets.QProgressDialog().open()
PySide6.QtWidgets.QStackedLayout().widget()
# PySide6.QtWidgets.QStylePainter().begin(qPaintDevice) # QPaintDevice: NotImplementedError
- PySide6.QtWidgets.QTableWidget().closePersistentEditor(qModelIndex)
- PySide6.QtWidgets.QTableWidget().openPersistentEditor(qModelIndex)
PySide6.QtWidgets.QTextEdit().find(findStr)
- PySide6.QtWidgets.QTreeWidget().closePersistentEditor(qModelIndex)
- PySide6.QtWidgets.QTreeWidget().openPersistentEditor(qModelIndex)
PySide6.QtWidgets.QWidget.find(quintptr)
""" if "PySide6.QtWidgets" in sys.modules else ""