aboutsummaryrefslogtreecommitdiffstats
path: root/PySide
diff options
context:
space:
mode:
authorLuciano Wolf <luciano.wolf@openbossa.org>2009-09-22 17:33:00 -0300
committerLuciano Wolf <luciano.wolf@openbossa.org>2009-09-22 17:33:42 -0300
commitd387c029cfacff6ad7011594a144bc911acd520c (patch)
tree52753df05180d6acc897f0ff539db3c60cc3df3e /PySide
parent0bc7485c2ea90a2cfe5cfae7f25cf9c25fc83b66 (diff)
Fix QTextCodec and QTextCodec::ConverterState classes.
Diffstat (limited to 'PySide')
-rw-r--r--PySide/QtCore/CMakeLists.txt4
-rw-r--r--PySide/QtCore/typesystem_core.xml8
2 files changed, 6 insertions, 6 deletions
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index bf021259f..1010c9ff5 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -71,8 +71,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtconcurrent_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtcore_module_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtemporaryfile_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextboundaryfinder_wrapper.cpp
-# ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextcodec_converterstate_wrapper.cpp
-# ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextcodec_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextcodec_converterstate_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextcodec_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextdecoder_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextencoder_wrapper.cpp
# ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qtextstream_wrapper.cpp
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 83bdd4bc5..324f71dd4 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1481,7 +1481,7 @@
</extra-includes>
</object-type>
<!-- FIXME Removed due to a shiboken bug-->
-<!-- <object-type name="QTextCodec">
+ <object-type name="QTextCodec">
<modify-function signature="makeDecoder()const">
<modify-argument index="return">
<define-ownership owner="c++"/>
@@ -1543,7 +1543,7 @@
<parent index="this" action="add"/>
</modify-argument>
</modify-function>
- </object-type>-->
+ </object-type>
<object-type name="QTextDecoder">
<modify-function signature="toUnicode(const char*,int)">
<remove/>
@@ -1570,14 +1570,14 @@
</extra-includes>
</object-type>
<!-- FIXME Removed due to a shiboken bug-->
-<!-- <value-type name="QTextCodec::ConverterState">
+ <object-type name="QTextCodec::ConverterState">
<include file-name="QTextCodec" location="global"/>
<modify-function signature="ConverterState(QFlags&lt;QTextCodec::ConversionFlag&gt;)">
<modify-argument index="1">
<replace-default-expression with="QTextCodec::DefaultConversion"/>
</modify-argument>
</modify-function>
- </value-type>-->
+ </object-type>
<object-type name="QBuffer">
<modify-function signature="buffer()const" remove="all"/>
<modify-function signature="data()const" remove="all"/>