Merge remote-tracking branch 'origin/5.6' into 5.9

Change-Id: I7906cfb72af65bea9f46a0684562ffaaa273bab2

7 files changed, 41 insertions, 8 deletions

diff --git a/PySide2/QtCore/typesystem_core_common.xml b/PySide2/QtCore/typesystem_core_common.xml
index 24a08489..a15547a4 100644
--- a/PySide2/QtCore/typesystem_core_common.xml
+++ b/PySide2/QtCore/typesystem_core_common.xml
@@ -872,6 +872,7 @@
     <enum-type name="BGMode"/>
     <enum-type name="BrushStyle"/>
     <enum-type name="CaseSensitivity"/>
+    <enum-type name="ChecksumType" since="5.9"/>
     <enum-type name="CheckState"/>
     <enum-type name="ClipOperation"/>
     <enum-type name="ConnectionType"/>
@@ -1777,6 +1778,7 @@
 
   <value-type name="QLocale">
     <enum-type name="Country" />
+    <enum-type name="FloatingPointPrecisionOption" since="5.7"/>
     <enum-type name="FormatType"/>
     <enum-type name="Language" />
     <enum-type name="MeasurementSystem"/>
@@ -3175,8 +3177,13 @@
   <object-type name="QCollatorSortKey" since="5.2" />
   <object-type name="QCollator" since="5.2" />
 
-  <object-type name="QCommandLineOption" since="5.2" />
-  <object-type name="QCommandLineParser" since="5.2" />
+  <object-type name="QCommandLineOption" since="5.2">
+    <enum-type name="Flag" flags="Flags" since="5.8"/>
+  </object-type>
+  <object-type name="QCommandLineParser" since="5.2">
+    <enum-type name="OptionsAfterPositionalArgumentsMode" since="5.6"/>
+    <enum-type name="SingleDashWordOptionMode"/>
+  </object-type>
 
   <object-type name="QCoreApplication">
     <!--Qt5: gone <enum-type name="Encoding" /> -->
diff --git a/PySide2/QtGui/typesystem_gui_common.xml b/PySide2/QtGui/typesystem_gui_common.xml
index 855610dc..90ba5f9a 100644
--- a/PySide2/QtGui/typesystem_gui_common.xml
+++ b/PySide2/QtGui/typesystem_gui_common.xml
@@ -1462,6 +1462,7 @@
   <object-type name="QPagedPaintDevice">
     <value-type name="Margins" />
     <enum-type name="PageSize" />
+    <enum-type name="PdfVersion" since="5.10"/>
   </object-type>
   <object-type name="QAbstractTextDocumentLayout">
     <value-type name="PaintContext" >
@@ -3191,6 +3192,7 @@
   </object-type>
   <rejection class="QSurface" field-name="m_reserved"/>
   <value-type name="QSurfaceFormat">
+    <enum-type name="ColorSpace" since="5.10"/>
     <enum-type name="FormatOption" flags="FormatOptions"/>
     <enum-type name="OpenGLContextProfile"/>
     <enum-type name="RenderableType"/>
@@ -3254,6 +3256,7 @@
   </object-type>
   <object-type name="QOpenGLFramebufferObject">
     <enum-type name="Attachment" />
+    <enum-type name="FramebufferRestorePolicy" since="5.7"/>
   </object-type>
   <object-type name="QOpenGLShader" >
     <enum-type name="ShaderTypeBit" flags="ShaderType" />
diff --git a/PySide2/QtMultimedia/typesystem_multimedia.xml b/PySide2/QtMultimedia/typesystem_multimedia.xml
index e73f3be0..e14c0b97 100644
--- a/PySide2/QtMultimedia/typesystem_multimedia.xml
+++ b/PySide2/QtMultimedia/typesystem_multimedia.xml
@@ -47,7 +47,9 @@
   <namespace-type name="QAudio">
       <enum-type name="Error"/>
       <enum-type name="Mode"/>
+      <enum-type name="Role" since="5.6"/>
       <enum-type name="State"/>
+      <enum-type name="VolumeScale" since="5.8"/>
   </namespace-type>
 
   <value-type name="QVideoSurfaceFormat">
diff --git a/PySide2/QtNetwork/typesystem_network.xml b/PySide2/QtNetwork/typesystem_network.xml
index d2150a9a..2f8424ac 100644
--- a/PySide2/QtNetwork/typesystem_network.xml
+++ b/PySide2/QtNetwork/typesystem_network.xml
@@ -177,6 +177,7 @@
     </object-type>
 
     <value-type name="QHostAddress" hash-function="qHash">
+        <enum-type name="ConversionModeFlag" flags="ConversionMode" since="5.8"/>
         <enum-type name="SpecialAddress"/>
         <!-- ### QHostAddress(QIPv6Address) does this -->
         <modify-function signature="QHostAddress(quint8*)" remove="all" />
@@ -259,6 +260,7 @@
         <enum-type name="Priority" since="4.7"/>
         <enum-type name="CacheLoadControl"/>
         <enum-type name="KnownHeaders"/>
+        <enum-type name="RedirectPolicy" since="5.9"/>
     </value-type>
 
     <value-type name="QNetworkConfiguration" since="4.7">
diff --git a/PySide2/QtQuick/typesystem_quick.xml b/PySide2/QtQuick/typesystem_quick.xml
index ee336426..0bee346b 100644
--- a/PySide2/QtQuick/typesystem_quick.xml
+++ b/PySide2/QtQuick/typesystem_quick.xml
@@ -118,6 +118,9 @@
     <!-- <object-type name="QSGFlatColorMaterial" /> -->
     <object-type name="QSGGeometry">
         <enum-type name="DataPattern" />
+        <enum-type name="AttributeType" since="5.8"/>
+        <enum-type name="DrawingMode" since="5.8"/>
+        <enum-type name="Type" since="5.8"/>
     </object-type>
     <value-type name="QSGGeometry::Attribute" />
     <value-type name="QSGGeometry::AttributeSet" />
@@ -149,6 +152,7 @@
         <enum-type name="TextureCoordinatesTransformFlag" flags="TextureCoordinatesTransformMode" />
     </object-type>
     <object-type name="QSGTexture">
+        <enum-type name="AnisotropyLevel" since="5.9"/>
         <enum-type name="Filtering" />
         <enum-type name="WrapMode" />
     </object-type>
diff --git a/PySide2/QtWidgets/typesystem_widgets_common.xml b/PySide2/QtWidgets/typesystem_widgets_common.xml
index 00980b5f..4b7a0f4e 100644
--- a/PySide2/QtWidgets/typesystem_widgets_common.xml
+++ b/PySide2/QtWidgets/typesystem_widgets_common.xml
@@ -3675,5 +3675,17 @@
 
   <!-- This enum is present on QtCore -->
   <suppress-warning text="enum 'QCoreApplication::ApplicationFlags' is specified in typesystem, but not declared" />
-
+  <suppress-warning text="QGraphicsEllipseItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsItemGroup::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsItem::UserType' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsLineItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsPathItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsPixmapItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsPolygonItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsProxyWidget::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsRectItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsSimpleTextItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsSvgItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsTextItem::Type' does not have a type entry or is not an enum"/>
+  <suppress-warning text="QGraphicsWidget::Type' does not have a type entry or is not an enum"/>
 </typesystem>
diff --git a/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml b/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
index 8a12b6f1..96970366 100644
--- a/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
+++ b/PySide2/QtXmlPatterns/typesystem_xmlpatterns.xml
@@ -66,17 +66,20 @@
     <object-type name="QXmlFormatter" />
     <value-type name="QXmlItem" />
     <value-type name="QXmlName">
+        <primitive-type name="NamespaceCode"/>
+        <primitive-type name="PrefixCode"/>
+        <primitive-type name="LocalNameCode"/>
         <!-- ### These methods aren't part of Qt public API -->
-        <modify-function signature="QXmlName(short, short, short)" remove="all" />
-        <modify-function signature="setNamespaceURI(short)" remove="all" />
+        <modify-function signature="QXmlName(QXmlName::NamespaceCode, QXmlName::LocalNameCode, QXmlName::PrefixCode)" remove="all"/>
+        <modify-function signature="setNamespaceURI(QXmlName::NamespaceCode)" remove="all" />
         <modify-function signature="localName()const" remove="all" />
         <modify-function signature="prefix()const" remove="all" />
         <modify-function signature="hasPrefix()const" remove="all" />
         <modify-function signature="hasNamespace()const" remove="all" />
         <modify-function signature="namespaceURI()const" remove="all" />
         <modify-function signature="isLexicallyEqual(const QXmlName&amp;)const" remove="all" />
-        <modify-function signature="setPrefix(short)" remove="all" />
-        <modify-function signature="setLocalName(short)" remove="all" />
+        <modify-function signature="setPrefix(QXmlName::PrefixCode)" remove="all" />
+        <modify-function signature="setLocalName(QXmlName::LocalNameCode)" remove="all" />
         <modify-function signature="code()const" remove="all" />
         <!-- ### -->
     </value-type>
@@ -100,7 +103,7 @@
         <modify-function signature="compareOrder(const QXmlNodeModelIndex &amp;)const" remove="all" />
         <modify-function signature="sendNamespaces(QAbstractXmlReceiver *)const" remove="all" />
         <modify-function signature="namespaceBindings()const" remove="all" />
-        <modify-function signature="namespaceForPrefix(short)const" remove="all" />
+        <modify-function signature="namespaceForPrefix(QXmlName::PrefixCode)const" remove="all" />
         <modify-function signature="stringValue()const" remove="all" />
         <modify-function signature="is(const QXmlNodeModelIndex &amp;)const" remove="all" />
         <modify-function signature="reset()" remove="all" />