From cae2ce11121189d426931e00a8d382171de8e925 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Fri, 19 Oct 2018 10:36:17 +0200
Subject: Fix build on 32bit Windows

Fix the exclusion of QCborStreamReader::readStringChunk(char*,qsizetype)
for 32/64bit depending on qsizetype.

Change-Id: I7cd16fc83508c4ad04c2bb5e8b433c4933fef13c
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'sources/pyside2/PySide2/QtCore')

diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 61b0bc6d0..838d95896 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -686,7 +686,10 @@
     <enum-type name="Type"/>
     <include file-name="qcborstream.h" location="global"/>
     <value-type name="StringResult" generate="no"/>
+    <!-- 64bit (qsizetype = long long) -->
     <modify-function signature="readStringChunk(char*,long long)" remove="all"/>
+    <!-- 32bit (qsizetype = int) -->
+    <modify-function signature="readStringChunk(char*,int)" remove="all"/>
   </object-type>
   <typedef-type name="QCborStringResultString" source="QCborStreamReader::StringResult&lt;QString&gt;" since="5.12"/>
   <typedef-type name="QCborStringResultByteArray" source="QCborStreamReader::StringResult&lt;QByteArray&gt;" since="5.12"/>
@@ -4387,6 +4390,8 @@ s1.addTransition(button.clicked, s1h)&lt;/code>
   <suppress-warning text="enum 'enum_5' does not have a type entry or is not an enum" />
   <suppress-warning text="enum 'FP_NORMAL' does not have a type entry or is not an enum" />
   <suppress-warning text="Shadowing: *" />
+  <!-- QCborStreamReader: Suppress warnings about 32/64bit signatures not found depending on qsizetype -->
+  <suppress-warning text="^signature 'readStringChunk\(char.*in 'QCborStreamReader' not found.*$"/>
 
   <!-- 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" />
-- 
cgit v1.2.3