aboutsummaryrefslogtreecommitdiffstats
path: root/PySide/QtCore
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2010-05-13 15:50:10 -0300
committerRenato Filho <renato.filho@openbossa.org>2010-05-17 19:53:29 -0300
commitd2a6f35ef914b000ddd7685925075985c76817ac (patch)
tree1e79ea3f68ec0291ff6a4d0b551e3db4ad329266 /PySide/QtCore
parent79ce19690db524e40f1e837cd52ebbbe251b3447 (diff)
Included QMetaMethod class in QtCore typesystem.
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>, Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide/QtCore')
-rw-r--r--PySide/QtCore/CMakeLists.txt1
-rw-r--r--PySide/QtCore/typesystem_core.xml5
2 files changed, 6 insertions, 0 deletions
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index 5c8deab67..215dfebf6 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -69,6 +69,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qlocale_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmetaclassinfo_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmetaenum_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmetaproperty_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmetamethod_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmetaobject_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmimedata_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qmodelindex_wrapper.cpp
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index f7cc85f90..1033f4763 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -714,6 +714,8 @@
<enum-type name="QLocale::Country" />
<enum-type name="Qt::ToolBarArea" flags="Qt::ToolBarAreas" />
<enum-type name="Qt::WidgetAttribute" />
+ <enum-type name="QMetaMethod::Access"/>
+ <enum-type name="QMetaMethod::MethodType"/>
<!--signal/slot-->
<inject-code class="native" position="beginning" file="glue/qslot.cpp" />
@@ -2550,6 +2552,8 @@
<include file-name="qobjectdefs.h" location="global" />
</value-type>
+
+ <value-type name="QMetaMethod"/>
<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" />
@@ -2850,6 +2854,7 @@
<suppress-warning text="enum 'enum_3' does not have a type entry or is not an enum"/>
<suppress-warning text="Shadowing: QFile::fileName() const and QTemporaryFile::fileName() const"/>
<suppress-warning text="enum 'QtValidLicenseForDeclarativeModule' does not have a type entry or is not an enum"/>
+ <suppress-warning text="enum 'QMetaMethod::Attributes' does not have a type entry or is not an enum"/>
<suppress-warning text="unhandled enum value: ~0u in Qt::GestureType"/>
<suppress-warning text="unhandled enum value: (sizeof(void*)&lt;&lt;3) in QSysInfo::Sizes"/>
<suppress-warning text="unmatched enum ~0u"/>