diff options
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 11 | ||||
| -rw-r--r-- | PySide/QtDeclarative/typesystem_declarative.xml | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 3cd052a6a..a4b4f9244 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -95,12 +95,6 @@ <enum-type name="QtMsgType"/> - <enum-type identified-by-value="QML_HAS_ATTACHED_PROPERTIES" since="4.7"> - <extra-includes> - <include file-name="Qt/qdeclarative.h" location="global"/> - </extra-includes> - </enum-type> - <primitive-type name="qint8"/> <primitive-type name="qint16"/> <primitive-type name="qint32"/> @@ -2837,4 +2831,9 @@ <suppress-warning text="enum 'enum_4' does not have a type entry or is not an enum" /> <suppress-warning text="enum 'enum_5' does not have a type entry or is not an enum" /> <suppress-warning text="Shadowing: *" /> + <!-- this enum is defined on Qt global header but only used in QtDeclarative module --> + <suppress-warning text="enum 'QML_HAS_ATTACHED_PROPERTIES' does not have a type entry or is not an enum" /> + + <!-- this enum is defined on Qt global header but only used in QtGui module --> + <suppress-warning text="enum 'PM_MessageBoxHeight' does not have a type entry or is not an enum" /> </typesystem> diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml index 888ca6fd9..ee7355cc5 100644 --- a/PySide/QtDeclarative/typesystem_declarative.xml +++ b/PySide/QtDeclarative/typesystem_declarative.xml @@ -23,6 +23,11 @@ <load-typesystem name="typesystem_network.xml" generate="no"/> <load-typesystem name="typesystem_gui.xml" generate="no"/> + <enum-type identified-by-value="QML_HAS_ATTACHED_PROPERTIES" since="4.7"> + <extra-includes> + <include file-name="Qt/qdeclarative.h" location="global"/> + </extra-includes> + </enum-type> <object-type name="QDeclarativeExtensionInterface"/> <object-type name="QDeclarativeComponent"> |