jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged typesystem (Qt 4.6 and 4.7)

Browse source 
Start use "since" tag on typesystem to Qt 4.7 modifications.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>,
          Marcelo Lira <marcelo.lira@openbossa.org>
This commit is contained in:
Renato Filho 2010-05-25 17:45:59 -03:00
commit 2264c8874c
9 changed files with 39 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PySide/QtGui/CMakeLists.txt
View file

@ -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/

2
PySide/QtGui/typesystem_gui_common.xml
View file

@ -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"/>