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

Change-Id: Ie8709052aa13c9bb2d0a7a376f9e6d669ef1d1d8

2 files changed, 26 insertions, 7 deletions

diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
index 0439f0a5c..384243f7c 100644
--- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
@@ -10,9 +10,6 @@ else()
     set(SPECIFIC_OS_FILES "")
 endif()
 
-# TODO: Fix cycling dependency  when generating QDataStream operator<< for QUuid
-set (QtCore_SRC_FIXED_ME ${QtCore_GEN_DIR}/quuid_wrapper.cpp)
-
 set(QtCore_SRC
 ${QtCore_GEN_DIR}/qabstractanimation_wrapper.cpp
 ${QtCore_GEN_DIR}/qabstracteventdispatcher_timerinfo_wrapper.cpp
@@ -100,6 +97,9 @@ ${QtCore_GEN_DIR}/qreadwritelock_wrapper.cpp
 ${QtCore_GEN_DIR}/qrect_wrapper.cpp
 ${QtCore_GEN_DIR}/qrectf_wrapper.cpp
 ${QtCore_GEN_DIR}/qregexp_wrapper.cpp
+${QtCore_GEN_DIR}/qregularexpression_wrapper.cpp
+${QtCore_GEN_DIR}/qregularexpressionmatch_wrapper.cpp
+${QtCore_GEN_DIR}/qregularexpressionmatchiterator_wrapper.cpp
 ${QtCore_GEN_DIR}/qresource_wrapper.cpp
 ${QtCore_GEN_DIR}/qrunnable_wrapper.cpp
 ${QtCore_GEN_DIR}/qsavefile_wrapper.cpp
@@ -141,7 +141,9 @@ ${QtCore_GEN_DIR}/qtimezone_offsetdata_wrapper.cpp
 ${QtCore_GEN_DIR}/qtranslator_wrapper.cpp
 ${QtCore_GEN_DIR}/qurl_wrapper.cpp
 ${QtCore_GEN_DIR}/qurlquery_wrapper.cpp
+${QtCore_GEN_DIR}/quuid_wrapper.cpp
 ${QtCore_GEN_DIR}/qvariantanimation_wrapper.cpp
+${QtCore_GEN_DIR}/qversionnumber_wrapper.cpp
 ${QtCore_GEN_DIR}/qwaitcondition_wrapper.cpp
 ${QtCore_GEN_DIR}/qwritelocker_wrapper.cpp
 ${QtCore_GEN_DIR}/qxmlstreamattribute_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 73e6648f6..f7a75783d 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -214,9 +214,11 @@
 
   <!-- Among other use cases, these types are necessary for OpenGL "GLint"-like typedefs on macOS.
   -->
+  <primitive-type name="int64_t" />
   <primitive-type name="int32_t" />
   <primitive-type name="int16_t" />
   <primitive-type name="int8_t" />
+  <primitive-type name="uint64_t" />
   <primitive-type name="uint32_t" />
   <primitive-type name="uint16_t" />
   <primitive-type name="uint8_t" />
@@ -1793,9 +1795,7 @@
     <value-type name="OffsetData"/>
   </value-type>
 
-  <!-- FIXME QT5: Remove QUuid because cyclic dependency found on overloaddata QUuid(), 
-  this lead to cyclic dependency in <<(QDataStream &, QUUid) and incorrect QDataStream code generation (Windows only)-->
-  <!-- <value-type name="QUuid">
+  <value-type name="QUuid">
     <enum-type name="Variant"/>
     <enum-type name="Version"/>
     <add-function signature="__repr__" return-type="PyObject*">
@@ -1814,7 +1814,7 @@
             </insert-template>
         </inject-code>
     </add-function>
-  </value-type> -->
+  </value-type>
 
   <value-type name="QMimeType" since="5.0" />
   <object-type name="QMimeDatabase" since="5.0">
@@ -2468,6 +2468,15 @@
         </inject-code>
     </add-function>
   </value-type>
+
+  <value-type name="QRegularExpression">
+    <enum-type name="MatchOption" flags="MatchOptions"/>
+    <enum-type name="MatchType"/>
+    <enum-type name="PatternOption" flags="PatternOptions"/>
+  </value-type>
+  <value-type name="QRegularExpressionMatch"/>
+  <value-type name="QRegularExpressionMatchIterator"/>
+
   <value-type name="QFileInfo">
     <extra-includes>
       <include file-name="QDateTime" location="global"/>
@@ -4135,6 +4144,14 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
 
   <object-type name="QVariantAnimation" since="4.6"/>
 
+  <value-type name="QVersionNumber" since="5.6">
+    <modify-function signature="fromString(const QString &amp;,int*)">
+      <modify-argument index="2">
+        <remove-argument/>
+      </modify-argument>
+    </modify-function>
+  </value-type>
+
   <!-- From Qt4.6 ^^^ -->
 
   <add-function signature="SIGNAL(const char*)" return-type="str">