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

Implemented module QtMaemo5.

Browse source 
Create unittest for module.
Fixed generetion of typesystem_gui.xml based on detected system.

Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>,
          Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
renato 2010-04-16 16:14:03 -03:00 • committed by Renato Filho
commit 3468ba1eff
8 changed files with 144 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
PySide/QtGui/CMakeLists.txt
View file

@ -33,21 +33,33 @@ macro(CHECK_QT_GUI_MACRO macro_display_name qt_macro module_sources global_sourc
endif()
endmacro(CHECK_QT_GUI_MACRO)
if(Q_WS_X11)
set(MODULE_NAME gui_x11)
set(AUTO_OS "X11")
set(MODULE_NAME "x11")
set(SPECIFIC_OS_FILES
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qx11info_wrapper.cpp
)
if(Q_WS_MAEMO_5)
set(AUTO_OS "MAEMO 5")
set(MODULE_NAME "maemo")
set(SPECIFIC_OS_FILES
${SPECIFIC_OS_FILES}
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractkineticscroller_wrapper.cpp
)
endif(Q_WS_MAEMO_5)
elseif(Q_WS_MAC)
set(MODULE_NAME gui_mac)
set(AUTO_OS "MAC")
set(MODULE_NAME "mac")
set(SPECIFIC_OS_FILES
)
else()
message(FATAL_ERROR "OS not supported")
endif(Q_WS_X11)
message(STATUS "Detected OS: ${AUTO_OS}")
if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6)
set (QtGui_46_SRC )
else()

3
PySide/QtGui/typesystem_gui.xml.in
View file

@ -1,6 +1,5 @@
<?xml version="1.0"?>
<typesystem package="PySide.QtGui">
<load-typesystem name="typesystem_core.xml" generate="no"/>
<!-- TODO: Replace x11 for a proper variable which identifies the current platform -->
<load-typesystem name="typesystem_gui_x11.xml" generate="yes"/>
<load-typesystem name="typesystem_gui_@MODULE_NAME@.xml" generate="yes"/>
</typesystem>

7
PySide/QtGui/typesystem_gui_maemo.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<typesystem package="PySide.QtGui">
<object-type name="QAbstractKineticScroller" />
<load-typesystem name="typesystem_gui_x11.xml" generate="yes"/>
</typesystem>