diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-30 07:55:46 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-30 07:55:46 +0200 |
commit | 7af97fa4136d66bbad6c7907de6e7bd823de2e43 (patch) | |
tree | 94123be1810104d257aa50fe4b387dd8a1bf2a6c /sources/shiboken2/tests/samplebinding/typesystem_sample.xml | |
parent | 3bbcb7b0e6e0342569aa155d695bca46a7459eb0 (diff) | |
parent | ff792fd2e6842b990aff61a4e953dab5efbd89ae (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I13721e13d2fab13945385fe529afe4ab431e0532
Diffstat (limited to 'sources/shiboken2/tests/samplebinding/typesystem_sample.xml')
-rw-r--r-- | sources/shiboken2/tests/samplebinding/typesystem_sample.xml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml index fdddb80f2..e4963721b 100644 --- a/sources/shiboken2/tests/samplebinding/typesystem_sample.xml +++ b/sources/shiboken2/tests/samplebinding/typesystem_sample.xml @@ -536,11 +536,6 @@ <enum-type identified-by-value="AnonymousGlobalEnum_Value0"/> - <namespace-type name="Invisible" visible="no"> - <enum-type name="EnumOnNamespace" /> - <value-type name="ObjectOnInvisibleNamespace" /> - </namespace-type> - <namespace-type name="SampleNamespace"> <enum-type name="Option"/> <enum-type name="InValue"/> @@ -603,6 +598,7 @@ <namespace-type name="RemovedNamespace1" visible='false'> <enum-type name="RemovedNamespace1_Enum" /> + <value-type name="ObjectOnInvisibleNamespace" /> <namespace-type name="RemovedNamespace2" visible='false'> <enum-type name="RemovedNamespace2_Enum" /> </namespace-type> |