diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-08-27 12:12:19 -0300 |
|---|---|---|
| committer | Renato Filho <renato.filho@openbossa.org> | 2010-08-27 15:24:55 -0300 |
| commit | 7b2903ad21aba22798b4ceace38c34d29bf7b8cc (patch) | |
| tree | 90f2fca308cc909ccf78970b5f522d0df2dde5d9 /PySide/QtGui | |
| parent | 2774fd8af75ad5a1f412d6e72493de438ce2b8ae (diff) | |
Fix typesystem based on auto OS detection.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Anderson Lizardo <anderson.lizardo@openbossa.org>
Diffstat (limited to 'PySide/QtGui')
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui.xml.in | 6 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_commom.xml (renamed from PySide/QtGui/typesystem_gui.xml) | 0 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_mac.xml | 2 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_simulator.xml | 2 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_x11.xml | 2 |
6 files changed, 15 insertions, 4 deletions
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index f4ec6d324..b2a5545d2 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -373,6 +373,10 @@ ${SPECIFIC_OS_FILES} ${QtGui_46_SRC} ) + +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/typesystem_gui.xml.in" + "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml" @ONLY) + check_qt_class(QtGui QGtkStyle QtGui_SRC) check_qt_class(QtGui QSessionManager QtGui_SRC) check_qt_class(QtGui QSizeGrip QtGui_SRC) @@ -407,5 +411,6 @@ create_pyside_module(QtGui QtGui_libraries QtGui_deps QtGui_typesystem_path - QtGui_SRC) + QtGui_SRC + "${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml") diff --git a/PySide/QtGui/typesystem_gui.xml.in b/PySide/QtGui/typesystem_gui.xml.in new file mode 100644 index 000000000..878f83749 --- /dev/null +++ b/PySide/QtGui/typesystem_gui.xml.in @@ -0,0 +1,6 @@ +<?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"/> + <load-typesystem name="typesystem_gui_commom.xml" generate="yes"/> +</typesystem> diff --git a/PySide/QtGui/typesystem_gui.xml b/PySide/QtGui/typesystem_gui_commom.xml index 66c33d4bd..66c33d4bd 100644 --- a/PySide/QtGui/typesystem_gui.xml +++ b/PySide/QtGui/typesystem_gui_commom.xml diff --git a/PySide/QtGui/typesystem_gui_mac.xml b/PySide/QtGui/typesystem_gui_mac.xml index 56f1f3236..a0c84c0fc 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.xml" generate="yes"/> + <load-typesystem name="typesystem_gui_commom.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_simulator.xml b/PySide/QtGui/typesystem_gui_simulator.xml index 188734974..5a122f033 100644 --- a/PySide/QtGui/typesystem_gui_simulator.xml +++ b/PySide/QtGui/typesystem_gui_simulator.xml @@ -31,5 +31,5 @@ <modify-function signature="handle()const" remove="all"/> </value-type> - <load-typesystem name="typesystem_gui.xml" generate="yes"/> + <load-typesystem name="typesystem_gui_commom.xml" generate="yes"/> </typesystem> diff --git a/PySide/QtGui/typesystem_gui_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml index 36f25ae24..4275782a9 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.xml" generate="yes"/> + <load-typesystem name="typesystem_gui_commom.xml" generate="yes"/> </typesystem> |