diff options
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core_common.xml | 2 | ||||
| -rw-r--r-- | sources/pyside6/doc/tools/pyside-project.rst | 11 | ||||
| -rw-r--r-- | sources/pyside6/tests/QtCore/qobject_property_test.py | 13 |
3 files changed, 18 insertions, 8 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml index f001178cc..bf04e04ed 100644 --- a/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml +++ b/sources/pyside6/PySide6/QtCore/typesystem_core_common.xml @@ -336,8 +336,6 @@ <add-conversion type="SbkObject" file="../glue/qtcore.cpp" snippet="conversion-sbkobject"/> <add-conversion type="PyDict" check="PyDict_CheckExact(%in)" file="../glue/qtcore.cpp" snippet="conversion-pydict"/> <add-conversion type="PyList" check="PyList_Check(%in)" file="../glue/qtcore.cpp" snippet="conversion-pylist"/> - <add-conversion type="PyTuple" check="PyTuple_CheckExact(%in)" - file="../glue/qtcore.cpp" snippet="conversion-pylist"/> <add-conversion type="PyObject" file="../glue/qtcore.cpp" snippet="conversion-pyobject"/> </target-to-native> </conversion-rule> diff --git a/sources/pyside6/doc/tools/pyside-project.rst b/sources/pyside6/doc/tools/pyside-project.rst index c6913f363..41b5bc9af 100644 --- a/sources/pyside6/doc/tools/pyside-project.rst +++ b/sources/pyside6/doc/tools/pyside-project.rst @@ -34,6 +34,17 @@ files are listed in the ``tool.pyside6-project`` table. For example: [tool.pyside6-project] files = ["main.py", "main_window.py"] +It is also possible to specify options for the :ref:`pyside6-rcc` and +:ref:`pyside6-uic` tools: + +.. code-block:: toml + + [tool.pyside6-rcc] + options = ["--compress-algo", "zlib"] + + [tool.pyside6-uic] + options = [" --star-imports"] + More information about the ``pyproject.toml`` file format can be found in `Python Packaging User Guide specification: "Writing your pyproject.toml"`_. diff --git a/sources/pyside6/tests/QtCore/qobject_property_test.py b/sources/pyside6/tests/QtCore/qobject_property_test.py index 9d2bd2c56..e0a8044fe 100644 --- a/sources/pyside6/tests/QtCore/qobject_property_test.py +++ b/sources/pyside6/tests/QtCore/qobject_property_test.py @@ -106,9 +106,10 @@ class QObjectWithOtherClassPropertyTest(unittest.TestCase): class VariantPropertyTest(unittest.TestCase): - """Test QVariant conversion in properties and signals (PYSIDE-3206, PYSIDE-3244). - It uses a property of list type that is passed a QVariantList - with various element types when using QObject.setProperty().""" + """Test QVariant conversion in properties and signals (PYSIDE-3256, + PYSIDE-3244, PYSIDE-3206 [open]). It uses a property of list type + that is passed a QVariantList with various element types when + using QObject.setProperty().""" def testIt(self): to = TestVariantPropertyObject() @@ -123,11 +124,11 @@ class VariantPropertyTest(unittest.TestCase): to.setProperty("testProperty", [{"key": 42}]) self.assertEqual(type(to.get_property()[0]), dict) - # PYSIDE-3206 (DBus): Convert a tuple to a list + # Tuple (PYSIDE-3256) to.setProperty("testProperty", [(1, 2)]) - self.assertEqual(type(to.get_property()[0]), list) + self.assertEqual(type(to.get_property()[0]), tuple) - # PYSIDE-324: The tuple conversion must not occur for named tuples + # Named Tuple (PYSIDE-3244) to.setProperty("testProperty", [Point(1, 2)]) self.assertEqual(type(to.get_property()[0]), Point) |
