aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariana Meireles <mariana.meireles-gontijo@qt.io>2019-11-26 17:11:05 +0100
committerMariana Meireles <mariana.meireles-gontijo@qt.io>2019-11-26 19:30:09 +0100
commitf5265a2ab8b19b181e7e7b8175a9598cf2a1fbc9 (patch)
tree2542afda0ec9b1f50c119ed0175511c1a7faf60a
parentb1fbe94e0524e519196082b0f03eb559c54d733d (diff)
Remove QGraphicsItem::scroll from QtCharts5.13
Removing this method to avoid being inherit from QChart, so we don't have the problem of having two scroll methods with the same arguments and we don't call the wrong one. Change-Id: Ia98ae1fdea39bed4435869fae7e5d380a73e9d91 Fixes: PYSIDE-1101 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--sources/pyside2/PySide2/QtCharts/typesystem_charts.xml3
1 files changed, 3 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
index b8550ef2..a1417758 100644
--- a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
+++ b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
@@ -41,6 +41,9 @@
-->
<typesystem package="PySide2.QtCharts">
<load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/>
+ <!-- PYSIDE-1101 Removing inherited method to avoid argument conflict
+ on the QChart::scroll overload -->
+ <rejection class="QGraphicsItem" function-name="scroll"/>
<namespace-type name="QtCharts">
<object-type name="QAbstractAxis" since="5.7">
<enum-type name="AxisType"/>