diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-29 07:35:34 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-29 07:35:34 +0200 |
| commit | 3bbcb7b0e6e0342569aa155d695bca46a7459eb0 (patch) | |
| tree | e3675d77f409db4ecbc4f92cdfdbfa62763cb2d4 /sources/shiboken2/tests/samplebinding | |
| parent | 9881b68c4c7bc1715cd266c41c63a3a918d83b07 (diff) | |
| parent | 50247e7d4a67e892a85dff7472f889bac97c91c7 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ie6da3938b82f5ebe96dd12bd65a3ccc4180d2fba
Diffstat (limited to 'sources/shiboken2/tests/samplebinding')
| -rw-r--r-- | sources/shiboken2/tests/samplebinding/pen_test.py | 14 | ||||
| -rw-r--r-- | sources/shiboken2/tests/samplebinding/typesystem_sample.xml | 7 |
2 files changed, 17 insertions, 4 deletions
diff --git a/sources/shiboken2/tests/samplebinding/pen_test.py b/sources/shiboken2/tests/samplebinding/pen_test.py index 89abf4d54..ff6ee5e0e 100644 --- a/sources/shiboken2/tests/samplebinding/pen_test.py +++ b/sources/shiboken2/tests/samplebinding/pen_test.py @@ -65,7 +65,19 @@ class TestPen(unittest.TestCase): self.assertEqual(pen.ctorType(), Pen.ColorCtor) pen.drawLine(0, 0, 5, 5) + def testPenRenderHintsProperty(self): + """Exercise the generated property setter and getters, checking + against the C++ getter/setter functions.""" + pen = Pen(1) + self.assertEqual(pen.getRenderHints(), Pen.RenderHints.None_) + self.assertEqual(pen.renderHints, Pen.RenderHints.None_) + pen.renderHints = Pen.RenderHints.TextAntialiasing + self.assertEqual(pen.getRenderHints(), Pen.RenderHints.TextAntialiasing) + self.assertEqual(pen.renderHints, Pen.RenderHints.TextAntialiasing) + pen.setRenderHints(Pen.RenderHints.Antialiasing) + self.assertEqual(pen.getRenderHints(), Pen.RenderHints.Antialiasing) + self.assertEqual(pen.renderHints, Pen.RenderHints.Antialiasing) + if __name__ == '__main__': unittest.main() - diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index 65738b85e..fdddb80f2 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -601,16 +601,16 @@ </add-function> </namespace-type> - <namespace-type name="RemovedNamespace1" generate='no'> + <namespace-type name="RemovedNamespace1" visible='false'> <enum-type name="RemovedNamespace1_Enum" /> - <namespace-type name="RemovedNamespace2" generate='no'> + <namespace-type name="RemovedNamespace2" visible='false'> <enum-type name="RemovedNamespace2_Enum" /> </namespace-type> <enum-type identified-by-value="RemovedNamespace1_AnonymousEnum_Value0" /> </namespace-type> <namespace-type name="UnremovedNamespace"> - <namespace-type name="RemovedNamespace3" generate='no'> + <namespace-type name="RemovedNamespace3" visible='false'> <enum-type name="RemovedNamespace3_Enum" /> <enum-type identified-by-value="RemovedNamespace3_AnonymousEnum_Value0" /> </namespace-type> @@ -2320,6 +2320,7 @@ <value-type name="Pen"> <enum-type identified-by-value="EnumCtor"/> <enum-type name="RenderHints"/> + <property type="RenderHints" name="renderHints" get="getRenderHints" set="setRenderHints"/> </value-type> <value-type name="CtorConvRule"> |