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

Change-Id: I20cf741f5b07426ad5113eb8c52f144102c331ce

2 files changed, 43 insertions, 21 deletions

diff --git a/sources/pyside2/PySide2/QtCore/CMakeLists.txt b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
index 5a8a41ec5..1d0b7d413 100644
--- a/sources/pyside2/PySide2/QtCore/CMakeLists.txt
+++ b/sources/pyside2/PySide2/QtCore/CMakeLists.txt
@@ -55,6 +55,7 @@ ${QtCore_GEN_DIR}/qfinalstate_wrapper.cpp
 ${QtCore_GEN_DIR}/qgenericargument_wrapper.cpp
 ${QtCore_GEN_DIR}/qgenericreturnargument_wrapper.cpp
 ${QtCore_GEN_DIR}/qhistorystate_wrapper.cpp
+${QtCore_GEN_DIR}/qidentityproxymodel_wrapper.cpp
 ${QtCore_GEN_DIR}/qiodevice_wrapper.cpp
 ${QtCore_GEN_DIR}/qjsonarray_wrapper.cpp
 ${QtCore_GEN_DIR}/qjsondocument_wrapper.cpp
@@ -67,8 +68,10 @@ ${QtCore_GEN_DIR}/qlibraryinfo_wrapper.cpp
 ${QtCore_GEN_DIR}/qline_wrapper.cpp
 ${QtCore_GEN_DIR}/qlinef_wrapper.cpp
 ${QtCore_GEN_DIR}/qlocale_wrapper.cpp
+${QtCore_GEN_DIR}/qlockfile_wrapper.cpp
 ${QtCore_GEN_DIR}/qmargins_wrapper.cpp
 ${QtCore_GEN_DIR}/qmarginsf_wrapper.cpp
+${QtCore_GEN_DIR}/qmessageauthenticationcode_wrapper.cpp
 ${QtCore_GEN_DIR}/qmessagelogcontext_wrapper.cpp
 ${QtCore_GEN_DIR}/qmetaclassinfo_wrapper.cpp
 ${QtCore_GEN_DIR}/qmetaenum_wrapper.cpp
@@ -83,6 +86,7 @@ ${QtCore_GEN_DIR}/qmodelindex_wrapper.cpp
 ${QtCore_GEN_DIR}/qmutex_wrapper.cpp
 ${QtCore_GEN_DIR}/qmutexlocker_wrapper.cpp
 ${QtCore_GEN_DIR}/qobject_wrapper.cpp
+${QtCore_GEN_DIR}/qoperatingsystemversion_wrapper.cpp
 ${QtCore_GEN_DIR}/qparallelanimationgroup_wrapper.cpp
 ${QtCore_GEN_DIR}/qpauseanimation_wrapper.cpp
 ${QtCore_GEN_DIR}/qpersistentmodelindex_wrapper.cpp
@@ -109,6 +113,7 @@ ${QtCore_GEN_DIR}/qsemaphore_wrapper.cpp
 ${QtCore_GEN_DIR}/qsemaphorereleaser_wrapper.cpp
 ${QtCore_GEN_DIR}/qsequentialanimationgroup_wrapper.cpp
 ${QtCore_GEN_DIR}/qsettings_wrapper.cpp
+${QtCore_GEN_DIR}/qsignalblocker_wrapper.cpp
 ${QtCore_GEN_DIR}/qsignalmapper_wrapper.cpp
 ${QtCore_GEN_DIR}/qsignaltransition_wrapper.cpp
 ${QtCore_GEN_DIR}/qsize_wrapper.cpp
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 77d074077..994bc10c8 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -1976,6 +1976,11 @@
         </inject-code>
     </add-function>
   </value-type>
+  <object-type name="QLockFile">
+      <enum-type name="LockError"/>
+  </object-type>
+  <object-type name="QMessageAuthenticationCode"/>
+  <object-type name="QSignalBlocker"/>
   <value-type name="QStorageInfo"/>
   <!-- QReadWriteLock does not have a copy ctor! -->
   <object-type name="QReadWriteLock">
@@ -2126,6 +2131,7 @@
     <modify-function signature="filterChanged()" remove="all"/>
     <!--### End of obsolete section -->
   </object-type>
+  <object-type name="QIdentityProxyModel"/>
   <!-- QObject is created manually -->
   <object-type name="QObject">
     <extra-includes>
@@ -2957,6 +2963,9 @@
         </inject-code>
     </modify-function>
   </object-type>
+  <value-type name="QOperatingSystemVersion" since="5.9">
+      <enum-type name="OSType"/>
+  </value-type>
   <object-type name="QLibraryInfo">
     <enum-type name="LibraryLocation"/>
   </object-type>
@@ -3006,27 +3015,27 @@
 
   <object-type name="QSocketNotifier">
     <enum-type name="Type"/>
-    <add-function signature="QSocketNotifier(PyObject*,QSocketNotifier::Type,QObject*)">
-        <modify-argument index="3">
-            <replace-default-expression with="0" />
-            <rename to="parent" />
-        </modify-argument>
-        <inject-code>
-        Shiboken::AutoDecRef fileNo(PyObject_GetAttrString(%PYARG_1, "fileno"));
-        if (!fileNo.isNull()) {
-            Shiboken::AutoDecRef fileNoValue(PyObject_CallObject(fileNo, 0));
-            if (%CHECKTYPE[int](fileNoValue)) {
-                int cppFileNoValue = %CONVERTTOCPP[int](fileNoValue);
-                /* Qt4 version:
-                 * %0 = new %TYPE(cppFileNoValue, %2, %3);
-                 * Qt5 has qintptr instead.
-                 * XXX check if this means a pointer or just the pointer size cast (what I implemented)
-                 */
-                qintptr socket = (qintptr)cppFileNoValue;
-                %0 = new %TYPE(socket, %2, %3);
-            }
-        }
-        </inject-code>
+    <add-function signature="QSocketNotifier(PyObject*, QSocketNotifier::Type, QObject*)">
+      <modify-argument index="3">
+        <replace-default-expression with="0" />
+        <rename to="parent" />
+      </modify-argument>
+      <inject-code>
+      Shiboken::AutoDecRef socket(%PYARG_1);
+      if (!socket.isNull()) {
+          // We use qintptr as PyLong, but we check for int
+          // since it is currently an alias to be Python2 compatible.
+          // Internally, ints are qlonglongs.
+          if (%CHECKTYPE[int](socket)) {
+              int cppSocket = %CONVERTTOCPP[int](socket);
+              qintptr socket = (qintptr)cppSocket;
+              %0 = new %TYPE(socket, %2, %3);
+          } else {
+              PyErr_SetString(PyExc_TypeError,
+                  "QSocketNotifier: first argument (socket) must be an int.");
+          }
+      }
+      </inject-code>
     </add-function>
   </object-type>
 
@@ -3262,6 +3271,14 @@
             QCoreApplicationConstructor(%PYSELF, args, &amp;%0);
         </inject-code>
     </add-function>
+    <add-function signature="QCoreApplication()">
+        <inject-code>
+            PyObject *empty = PyTuple_New(2);
+            if (!PyTuple_SetItem(empty, 0, PyList_New(0))) {
+                QCoreApplicationConstructor(%PYSELF, empty, &amp;%0);
+            }
+        </inject-code>
+    </add-function>
     <!-- blocking functions -->
     <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;,int)" allow-thread="yes"/>
     <modify-function signature="processEvents(QFlags&lt;QEventLoop::ProcessEventsFlag&gt;)" allow-thread="yes"/>