diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-10-25 15:39:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-11-25 16:15:06 +0100 |
| commit | 0ced05f77b88c68c8e2a1c71161cb19b9c890f59 (patch) | |
| tree | 572383fc27b857a4a77d6b8a68b28108b9d346ac /sources/pyside2 | |
| parent | 60795a6fc7460b9c5b115270541ef573ba15cde9 (diff) | |
shiboken: Store the unqualified entry name in TypeEntry
With the previous change adding a parent pointer, this is working
towards building the target lang name by walking up the hierarchy,
prepending the names, making it possible to exclude namespaces.
Pass the unqualified name from the XML parser and build
the qualified name in the TypeEntry constructor.
For this to work, a new ConstantValueTypeEntry is added replacing the
abuse of EnumValueTypeEntry for nontype-template parameters.
As a side effect, it is no longer possible to nest types
by qualifying with "::" in XML:
<object-type name="Class"/>
<enum-type name="Class::Enum"/>
This needs to be fixed in the type system files.
[ChangeLog][shiboken] As a result of a code cleanup, it is
no longer possible to nest types by by qualifying with "::" in
the type system files. The elements need to be properly nested.
Task-number: PYSIDE-990
Task-number: PYSIDE-1074
Change-Id: I8a2f93c40d59167b0ba205ef3ff3b325d242c3d3
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2')
| -rw-r--r-- | sources/pyside2/PySide2/QtQuick/typesystem_quick.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml index 7a18dac54..223eff773 100644 --- a/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml +++ b/sources/pyside2/PySide2/QtQuick/typesystem_quick.xml @@ -55,8 +55,9 @@ <object-type name="QQuickAsyncImageProvider" since="5.6"/> - <object-type name="QQuickFramebufferObject"/> - <object-type name="QQuickFramebufferObject::Renderer"/> + <object-type name="QQuickFramebufferObject"> + <object-type name="Renderer"/> + </object-type> <object-type name="QQuickTextureFactory"/> <object-type name="QQuickImageProvider"/> @@ -122,12 +123,12 @@ <enum-type name="AttributeType" since="5.8"/> <enum-type name="DrawingMode" since="5.8"/> <enum-type name="Type" since="5.8"/> + <value-type name="Attribute"/> + <value-type name="AttributeSet"/> + <value-type name="ColoredPoint2D"/> + <value-type name="Point2D"/> + <value-type name="TexturedPoint2D"/> </object-type> - <value-type name="QSGGeometry::Attribute"/> - <value-type name="QSGGeometry::AttributeSet"/> - <value-type name="QSGGeometry::ColoredPoint2D"/> - <value-type name="QSGGeometry::Point2D"/> - <value-type name="QSGGeometry::TexturedPoint2D"/> <object-type name="QSGGeometryNode"/> <!-- QSGMaterialShader doesn't compile because of const char * char * types not being recognized |