diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-05-25 17:45:59 -0300 |
|---|---|---|
| committer | Renato Filho <renato.filho@openbossa.org> | 2010-05-26 16:24:07 -0300 |
| commit | 2264c8874cc2939217745ad9d0daa47e770e9578 (patch) | |
| tree | ce1023ce66627b29ff62c22102db8672470a59fc /PySide/QtCore | |
| parent | 893946b5727dfa3489bc3d2fa411fd24fd3d8ff7 (diff) | |
Merged typesystem (Qt 4.6 and 4.7)
Start use "since" tag on typesystem to Qt 4.7 modifications.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>,
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide/QtCore')
| -rw-r--r-- | PySide/QtCore/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 5 |
2 files changed, 16 insertions, 2 deletions
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt index 01cadfafb..757251919 100644 --- a/PySide/QtCore/CMakeLists.txt +++ b/PySide/QtCore/CMakeLists.txt @@ -26,6 +26,15 @@ else() ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qvariantanimation_wrapper.cpp ) endif() +if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 7) + set (QtCore_47_SRC ) +else() + set(QtCore_47_SRC + ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qelapsedtimer_wrapper.cpp + ) +endif() + + set(QtCore_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qabstracteventdispatcher_wrapper.cpp @@ -129,11 +138,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamnamespacedeclaration_wrapper ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamnotationdeclaration_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamreader_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qxmlstreamwriter_wrapper.cpp - ${QtCore_46_SRC} +${QtCore_47_SRC} ) -execute_generator(core QtCore_SRC "") +execute_generator(core QtCore_SRC "${CMAKE_CURRENT_BINARY_DIR}") include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/ diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index e64006c0e..9711e2da6 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -95,6 +95,9 @@ <enum-type name="QAbstractAnimation::DeletionPolicy"/> <enum-type name="QAbstractAnimation::Direction"/> <enum-type name="QAbstractAnimation::State"/> + + <enum-type name="QElapsedTimer::ClockType" since="4.7"/> + <!-- From Qt4.6 ^^^ --> <primitive-type name="qint8"/> <primitive-type name="qint16"/> @@ -725,6 +728,8 @@ #include <pyside.h> </inject-code> + <value-type name="QElapsedTimer" since="4.7"/> + <object-type name="QAbstractTableModel" polymorphic-id-expression="qobject_cast<QAbstractTableModel*>(%1)"> <extra-includes> <include file-name="QStringList" location="global"/> |