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/QtGui | |
| 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/QtGui')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index f883e4e60..e9f44d784 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -470,7 +470,7 @@ CHECK_QT_GUI_MACRO("SessionManager Support" QT_NO_SESSIONMANAGER QT_SESSIONMANAG configure_file(typesystem_gui.xml.in "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY) -execute_generator(gui QtGui_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}") +execute_generator(gui QtGui_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtCore_BINARY_DIR}") include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/ diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 956be38e4..f971f2543 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -241,6 +241,7 @@ <enum-type name="QPageSetupDialog::PageSetupDialogOption" flags="QPageSetupDialog::PageSetupDialogOptions"/> <enum-type name="QPainter::CompositionMode"/> <enum-type name="QPainter::RenderHint" flags="QPainter::RenderHints"/> + <enum-type name="QPainter::PixmapFragmentHint" flags="QPainter::PixmapFragmentHints" since="4.7"/> <enum-type name="QPainterPath::ElementType"/> <enum-type name="QPrintEngine::PrintEnginePropertyKey" /> <enum-type name="QPrinter::ColorMode"/> @@ -368,6 +369,7 @@ <enum-type name="QTextDocument::FindFlag" flags="QTextDocument::FindFlags"/> <enum-type name="QTextDocument::MetaInformation"/> <enum-type name="QTextDocument::ResourceType"/> + <enum-type name="QTextDocument::Stacks" since="4.7"/> <enum-type name="QTextEdit::AutoFormattingFlag" flags="QTextEdit::AutoFormatting"/> <enum-type name="QTextEdit::LineWrapMode"/> <enum-type name="QTextFormat::ObjectTypes"/> |