diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2019-07-18 10:18:43 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2019-07-18 10:56:11 +0200 |
| commit | 2228615ac4f55abf07a1f7e28bbbfee9f3ae036a (patch) | |
| tree | d12f0c1af2b6cdf486ff389607844a657a1b67c1 /sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | |
| parent | 97718de50e14f69048993df4e87dda1cadcc599a (diff) | |
| parent | 4646b8660721e5b8d06b06d714b4562e375f8c34 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 11 |
1 files changed, 6 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..9ffc7d376 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -2514,11 +2514,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"/> |