diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-28 09:50:04 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-28 09:55:39 +0100 |
| commit | dd772392f52f2bed8eb937f375692114d2acbac7 (patch) | |
| tree | 871044fa862ef105bd67d2a1d981be1eeaf716fa | |
| parent | a707b24f58464eec20e8905e2e742efc753a70ea (diff) | |
| parent | f5265a2ab8b19b181e7e7b8175a9598cf2a1fbc9 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I698090a9c9fdc995e00e39873aa35f8edda0f0b1
5 files changed, 7 insertions, 4 deletions
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"/> diff --git a/sources/pyside2/tests/registry/exists_darwin_5_14_0_ci.py b/sources/pyside2/tests/registry/exists_darwin_5_14_0_ci.py index a1385298a..98ec8fcbc 100644 --- a/sources/pyside2/tests/registry/exists_darwin_5_14_0_ci.py +++ b/sources/pyside2/tests/registry/exists_darwin_5_14_0_ci.py @@ -34972,7 +34972,7 @@ sig_dict.update({ "PySide2.QtCharts.QtCharts.QChart.removeAllSeries": (), "PySide2.QtCharts.QtCharts.QChart.removeAxis": ('PySide2.QtCharts.QtCharts.QAbstractAxis',), "PySide2.QtCharts.QtCharts.QChart.removeSeries": ('PySide2.QtCharts.QtCharts.QAbstractSeries',), - "PySide2.QtCharts.QtCharts.QChart.scroll": [('float', 'float'), ('float', 'float', 'PySide2.QtCore.QRectF')], + "PySide2.QtCharts.QtCharts.QChart.scroll": ('float', 'float'), "PySide2.QtCharts.QtCharts.QChart.series": (), "PySide2.QtCharts.QtCharts.QChart.setAnimationDuration": ('int',), "PySide2.QtCharts.QtCharts.QChart.setAnimationEasingCurve": ('PySide2.QtCore.QEasingCurve',), diff --git a/sources/pyside2/tests/registry/exists_red_hat_enterprise_linux_workstation7_6_5_14_0_ci.py b/sources/pyside2/tests/registry/exists_red_hat_enterprise_linux_workstation7_6_5_14_0_ci.py index 2cdf9d6f7..e19f8a27c 100644 --- a/sources/pyside2/tests/registry/exists_red_hat_enterprise_linux_workstation7_6_5_14_0_ci.py +++ b/sources/pyside2/tests/registry/exists_red_hat_enterprise_linux_workstation7_6_5_14_0_ci.py @@ -34994,7 +34994,7 @@ sig_dict.update({ "PySide2.QtCharts.QtCharts.QChart.removeAllSeries": (), "PySide2.QtCharts.QtCharts.QChart.removeAxis": ('PySide2.QtCharts.QtCharts.QAbstractAxis',), "PySide2.QtCharts.QtCharts.QChart.removeSeries": ('PySide2.QtCharts.QtCharts.QAbstractSeries',), - "PySide2.QtCharts.QtCharts.QChart.scroll": [('float', 'float'), ('float', 'float', 'PySide2.QtCore.QRectF')], + "PySide2.QtCharts.QtCharts.QChart.scroll": ('float', 'float'), "PySide2.QtCharts.QtCharts.QChart.series": (), "PySide2.QtCharts.QtCharts.QChart.setAnimationDuration": ('int',), "PySide2.QtCharts.QtCharts.QChart.setAnimationEasingCurve": ('PySide2.QtCore.QEasingCurve',), diff --git a/sources/pyside2/tests/registry/exists_win32_5_14_0_ci.py b/sources/pyside2/tests/registry/exists_win32_5_14_0_ci.py index b89ecc7dd..575236710 100644 --- a/sources/pyside2/tests/registry/exists_win32_5_14_0_ci.py +++ b/sources/pyside2/tests/registry/exists_win32_5_14_0_ci.py @@ -35148,7 +35148,7 @@ sig_dict.update({ "PySide2.QtCharts.QtCharts.QChart.removeAllSeries": (), "PySide2.QtCharts.QtCharts.QChart.removeAxis": ('PySide2.QtCharts.QtCharts.QAbstractAxis',), "PySide2.QtCharts.QtCharts.QChart.removeSeries": ('PySide2.QtCharts.QtCharts.QAbstractSeries',), - "PySide2.QtCharts.QtCharts.QChart.scroll": [('float', 'float'), ('float', 'float', 'PySide2.QtCore.QRectF')], + "PySide2.QtCharts.QtCharts.QChart.scroll": ('float', 'float'), "PySide2.QtCharts.QtCharts.QChart.series": (), "PySide2.QtCharts.QtCharts.QChart.setAnimationDuration": ('int',), "PySide2.QtCharts.QtCharts.QChart.setAnimationEasingCurve": ('PySide2.QtCore.QEasingCurve',), diff --git a/sources/pyside2/tests/registry/exists_x86_64_suse_linux_5_14_0_ci.py b/sources/pyside2/tests/registry/exists_x86_64_suse_linux_5_14_0_ci.py index 0e293986a..2bacf6ae7 100644 --- a/sources/pyside2/tests/registry/exists_x86_64_suse_linux_5_14_0_ci.py +++ b/sources/pyside2/tests/registry/exists_x86_64_suse_linux_5_14_0_ci.py @@ -34987,7 +34987,7 @@ sig_dict.update({ "PySide2.QtCharts.QtCharts.QChart.removeAllSeries": (), "PySide2.QtCharts.QtCharts.QChart.removeAxis": ('PySide2.QtCharts.QtCharts.QAbstractAxis',), "PySide2.QtCharts.QtCharts.QChart.removeSeries": ('PySide2.QtCharts.QtCharts.QAbstractSeries',), - "PySide2.QtCharts.QtCharts.QChart.scroll": [('float', 'float'), ('float', 'float', 'PySide2.QtCore.QRectF')], + "PySide2.QtCharts.QtCharts.QChart.scroll": ('float', 'float'), "PySide2.QtCharts.QtCharts.QChart.series": (), "PySide2.QtCharts.QtCharts.QChart.setAnimationDuration": ('int',), "PySide2.QtCharts.QtCharts.QChart.setAnimationEasingCurve": ('PySide2.QtCore.QEasingCurve',), |