diff options
| author | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2010-08-16 21:59:45 -0400 |
|---|---|---|
| committer | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2010-08-26 11:06:55 -0400 |
| commit | d53f699751047b18e7c729de3cdcc7eb45b32dd1 (patch) | |
| tree | cf5e0174ecfda9d08f3dd37d726a3c1834683cc4 /PySide/QtGui | |
| parent | 3c36d444729ee9285bb4ab0252968057bf904a8d (diff) | |
Simplify handling of typesystems for multiple OSes
* Factor out install() commands into PySide/CMakeLists.txt
* Drop typesystem_<module>_common.xml and typesystem_<module>.xml.in,
and make typesystem_<module>_<os>.xml (if exists) include
typesystem_<module>.xml (which holds common data)
Reviewed-by: Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
Diffstat (limited to 'PySide/QtGui')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui.xml (renamed from PySide/QtGui/typesystem_gui_common.xml) | 2 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui.xml.in | 5 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_mac.xml | 2 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_x11.xml | 2 |
5 files changed, 5 insertions, 19 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index a848b65e0..88ec19164 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -459,10 +459,7 @@ set(QT_SESSIONMANAGER_SRCS ) CHECK_QT_GUI_MACRO("SessionManager Support" QT_NO_SESSIONMANAGER QT_SESSIONMANAGER_SRCS QtGui_SRC) -configure_file(typesystem_gui.xml.in - "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY) - -set(QtGui_typesystem_path "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}:${QtCore_BINARY_DIR}") +set(QtGui_typesystem_path "${QtCore_SOURCE_DIR}") set(QtGui_include_dirs ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/ ${QT_INCLUDE_DIR} @@ -476,15 +473,7 @@ set(QtGui_libraries pyside ${QT_QTGUI_LIBRARY}) set(QtGui_deps "QtCore") -# extra install -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_common.xml - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_mac.xml - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_maemo.xml - ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui_x11.xml - DESTINATION share/PySide/typesystems) - create_pyside_module(QtGui - ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml QtGui_include_dirs QtGui_libraries QtGui_deps diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui.xml index b11ec9f62..a5dcfd928 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui.xml @@ -1,5 +1,7 @@ <?xml version="1.0"?> <typesystem package="PySide.QtGui"> + <load-typesystem name="typesystem_core.xml" generate="no"/> + <template name="QFontCharFix"> int size = PyString_GET_SIZE(%PYARG_1); if (size == 1) { diff --git a/PySide/QtGui/typesystem_gui.xml.in b/PySide/QtGui/typesystem_gui.xml.in deleted file mode 100644 index 3ef63d9c9..000000000 --- a/PySide/QtGui/typesystem_gui.xml.in +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0"?> -<typesystem package="PySide.QtGui"> - <load-typesystem name="typesystem_core.xml" generate="no"/> - <load-typesystem name="typesystem_gui_@AUTO_OS@.xml" generate="yes"/> -</typesystem> diff --git a/PySide/QtGui/typesystem_gui_mac.xml b/PySide/QtGui/typesystem_gui_mac.xml index b27df0fce..56f1f3236 100644 --- a/PySide/QtGui/typesystem_gui_mac.xml +++ b/PySide/QtGui/typesystem_gui_mac.xml @@ -5,7 +5,7 @@ <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/> - <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> + <load-typesystem name="typesystem_gui.xml" generate="yes"/> <suppress-warning text="enum 'QPixmap::ShareMode' does not have a type entry or is not an enum" /> <suppress-warning text="enum 'QSysInfo::Endian' is specified in typesystem, but not declared" /> diff --git a/PySide/QtGui/typesystem_gui_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml index 742987430..36f25ae24 100644 --- a/PySide/QtGui/typesystem_gui_x11.xml +++ b/PySide/QtGui/typesystem_gui_x11.xml @@ -10,5 +10,5 @@ <enum-type name="QPixmap::ShareMode"/> - <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> + <load-typesystem name="typesystem_gui.xml" generate="yes"/> </typesystem> |