From 3468ba1efffc17f532ca69007602e87f19245304 Mon Sep 17 00:00:00 2001 From: renato Date: Fri, 16 Apr 2010 16:14:03 -0300 Subject: Implemented module QtMaemo5. Create unittest for module. Fixed generetion of typesystem_gui.xml based on detected system. Reviewer: Hugo Parente Lima , Luciano Wolf --- PySide/QtGui/CMakeLists.txt | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'PySide/QtGui/CMakeLists.txt') diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index ea181abb2..9701ffb1a 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -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() -- cgit v1.2.3