aboutsummaryrefslogtreecommitdiffstats
path: root/PySide/QtCore
diff options
context:
space:
mode:
authorrenato <renato.filho@openbossa.org>2010-01-28 15:39:52 -0300
committerRenato Filho <renato.filho@openbossa.org>2010-01-28 18:10:51 -0300
commitb71cade8c68f15591c16639b259628d1fdcb8226 (patch)
treef8fbe1174d1ec3720ddc1dc4c5c5e1db4ab6e371 /PySide/QtCore
parent1d026bf13fbb6736a1094658ba864267b0e6e8ff (diff)
Export QGenericArgument and QGenericReturnArgument types for QtCore.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide/QtCore')
-rw-r--r--PySide/QtCore/CMakeLists.txt2
-rw-r--r--PySide/QtCore/typesystem_core.xml6
2 files changed, 6 insertions, 2 deletions
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 4ce06a033..3dff71896 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -29,6 +29,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfile_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfileinfo_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfilesystemwatcher_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qfsfileengine_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qgenericargument_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qgenericreturnargument_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qiodevice_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qlatin1char_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qlatin1string_wrapper.cpp
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index b87eb90f1..ce1534552 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -61,7 +61,6 @@
<rejection class="" function-name="qSetRealNumberPrecision" />
<!-- TODO: We do not support void* or const void* as arg -->
- <rejection class="QGenericArgument"/>
<rejection class="QMetaObject" function-name="activate"/>
<rejection class="QMetaObject" function-name="invokeMethod"/>
<rejection class="QMetaObject" function-name="newInstance"/>
@@ -2684,9 +2683,12 @@
<value-type name="QGenericArgument">
<include file-name="qobjectdefs.h" location="global" />
+ </value-type>
- <modify-function signature="data()const" remove="all" />
+ <value-type name="QGenericReturnArgument">
+ <include file-name="qobjectdefs.h" location="global" />
</value-type>
+
<object-type name="QMetaObject">
<include file-name="qobjectdefs.h" location="global" />
<modify-function signature="connect(const QObject*, int, const QObject*, int, int, int*)" remove="all" />