diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-12 14:21:55 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-08-12 21:19:57 +0200 |
| commit | f905f6850a13dad7fb94cd59391ff863782061b1 (patch) | |
| tree | c2af02dd852c62b9464adb72ffea0bed0a6af57a /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | 3cc4de133f74554ddc50296385ac0ec7fd98c6d6 (diff) | |
| parent | 970a8c4ab770ef190b88e4c83d3199040820e676 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into dev"
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 9f8d07733..eb4e502ea 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -2299,8 +2299,10 @@ <object-type name="QRandomGenerator" since="5.10"> <modify-function signature="global()" rename="global_" allow-thread="yes"/> <modify-function signature="operator()()" remove="all"/> + <modify-function signature="generate(quint32*,quint32*)" remove="all"/> </object-type> <object-type name="QRandomGenerator64" since="5.10"> + <modify-function signature="global()" rename="global_" allow-thread="yes"/> <modify-function signature="operator()()" remove="all"/> </object-type> <object-type name="QSemaphore"> @@ -2514,11 +2516,12 @@ <define-ownership class="target" owner="default"/> </modify-argument> </modify-function> - <modify-function signature="value(const QString&,const QVariant&)const"> - <inject-documentation mode="append" format="target"> - .. warning:: QSettings.value can return different types (QVariant types) depending on the platform it's running on, so the safest way to use it is always casting the result to the desired type, e.g.: int(settings.value("myKey")) - </inject-documentation> - </modify-function> + <!-- PYSIDE-1010: + We remove the original implementation of value() to include the optional parameter --> + <modify-function signature="value(const QString&,const QVariant&)const" remove="all"/> + <add-function signature="value(const QString&, const QVariant& @defaultValue@ = 0, PyObject* @type@ = 0)" return-type="PyObject*"> + <inject-code class="target" position="beginning" file="../glue/qtcore.cpp" snippet="qsettings-value"/> + </add-function> </object-type> <object-type name="QEvent" polymorphic-id-expression="%1->type() == QEvent::None"> <enum-type name="Type"/> |