aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtCore
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2017-11-15 14:15:16 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-01-31 07:39:55 +0000
commit5d458c258fbaf3b24ffa0132093be4d6af2f8dfd (patch)
treedd2ba904413810b704af5b122ee6c83f6e77d1ff /sources/pyside2/PySide2/QtCore
parentc3f7967ff3699be8d68e00f875d01f526061166d (diff)
Add Qt3D
Task-number: PYSIDE-487 Change-Id: I17100eda57fbe5015b6c8ff531a3c62b22e8de95 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtCore')
-rw-r--r--sources/pyside2/PySide2/QtCore/typesystem_core_common.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
index 0ff1c681a..406fa5b96 100644
--- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
+++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml
@@ -3107,6 +3107,8 @@
<object-type name="QBuffer">
<!-- ### setData(QByteArray) do the job -->
<modify-function signature="setData(const char*,int)" remove="all"/>
+ <!-- Disambiguate from Qt3DRender/qbuffer.h -->
+ <include file-name="QtCore/qbuffer.h" location="global"/>
</object-type>
<object-type name="QTimer">
<modify-function signature="singleShot(int,const QObject*,const char*)">