From f5265a2ab8b19b181e7e7b8175a9598cf2a1fbc9 Mon Sep 17 00:00:00 2001
From: Mariana Meireles <mariana.meireles-gontijo@qt.io>
Date: Tue, 26 Nov 2019 17:11:05 +0100
Subject: Remove QGraphicsItem::scroll from QtCharts

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>
---
 sources/pyside2/PySide2/QtCharts/typesystem_charts.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml b/sources/pyside2/PySide2/QtCharts/typesystem_charts.xml
index b8550ef2c..a14177586 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"/>
-- 
cgit v1.2.3