diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-01 20:58:41 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-02 15:07:59 -0300 |
| commit | 8f4246a522aa02c9e1d7e44ab6a18d13075d53b9 (patch) | |
| tree | 34e4551d31960708e3850ca03f8231211dd3fcd3 /PySide/QtGui | |
| parent | 94ce2814e9a3709ab7d60f3acee6576fe9476b1d (diff) | |
Fix bug#125 - "QAbstractTextDocumentLayout.registerHandler apparently not working"
Added class QPyTextObject which inherits from QObject and QTextObjectInterface to
solve the issue with registerHandler, the same approach used by PyQt.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'PySide/QtGui')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 902243bcf..64aa73f34 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -55,6 +55,8 @@ else() ) endif () +qt4_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside_SOURCE_DIR}/qpytextobject.h") + set(QtGui_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractbutton_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractgraphicsshapeitem_wrapper.cpp @@ -227,6 +229,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpolygon_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprogressbar_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qprogressdialog_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qproxymodel_wrapper.cpp +${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpytextobject_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qpushbutton_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qradialgradient_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qradiobutton_wrapper.cpp @@ -395,6 +398,7 @@ check_qt_class(QtGui QPrintEngine QtGui_SRC) set(QtGui_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}") set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/ + ${pyside_SOURCE_DIR} ${QT_INCLUDE_DIR} ${SHIBOKEN_INCLUDE_DIR} ${libpyside_SOURCE_DIR} @@ -412,5 +416,6 @@ create_pyside_module(QtGui QtGui_deps QtGui_typesystem_path QtGui_SRC - "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml") + "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" + QPYTEXTOBJECT_MOC) diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 48bad7a7e..b21750987 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -1388,6 +1388,7 @@ <modify-argument index="1" invalidate-after-use="yes"/> </modify-function> </object-type> + <object-type name="QPyTextObject" /> <object-type name="QActionGroup"> <modify-function signature="addAction(QAction*)"> <modify-argument index="1"> @@ -2527,7 +2528,7 @@ <extra-includes> <include file-name="autoarraypointer.h" location="global"/> </extra-includes> - + <modify-argument index="2"> <remove-argument/> <conversion-rule class="native"> |