From f9d4a28fef8b234b6ef173fc3d21408f67b37472 Mon Sep 17 00:00:00 2001
From: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Date: Mon, 3 Dec 2018 16:25:12 +0100
Subject: Cast PyLongs to WId

QScreen.grabWindow and QWindow.fromWinId have
an WId as an argument.
WId is treated as a PyLong internally,
but with methods that need a WId we need to manually
transform them to long.

Change-Id: I97651704f37ae268455990a13884b92e8f1b643c
Fixes: PYSIDE-863
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml')

diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
index 16bce9d30..2181ff073 100644
--- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
+++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml
@@ -2515,6 +2515,12 @@
           <insert-template name="return_native_eventfilter"/>
       </inject-code>
     </modify-function>
+    <modify-function signature="fromWinId(WId)">
+      <modify-argument index="1">
+          <replace-type modified-type="long"/>
+      </modify-argument>
+      <inject-code file="../glue/qtgui.cpp" snippet="qwindow-fromWinId"/>
+    </modify-function>
   </object-type>
 
   <object-type name="QGuiApplication">
@@ -2971,7 +2977,14 @@
       <modify-function signature="glyphIndexesForChars(const QChar*,int,quint32*,int*)const" remove="all"/>
   </value-type>
   <object-type name="QRasterWindow"/>
-  <object-type name="QScreen"/>
+  <object-type name="QScreen">
+      <modify-function signature="grabWindow(WId,int,int,int,int)">
+        <modify-argument index="1">
+            <replace-type modified-type="long"/>
+        </modify-argument>
+        <inject-code file="../glue/qtgui.cpp" snippet="qscreen-grabWindow"/>
+      </modify-function>
+  </object-type>
   <object-type name="QStyleHints"/>
 
 </typesystem>
-- 
cgit v1.2.3