diff options
| author | Renato Oliveira <renolive@rodrigo-oliveiras-macbook-pro-15.local> | 2010-05-19 14:32:14 -0300 |
|---|---|---|
| committer | Renato Filho <renato.filho@openbossa.org> | 2010-05-19 17:40:14 -0300 |
| commit | bb32f636589e915811d5ad9dce598f226fa49fbf (patch) | |
| tree | 93fff0c418e50d218665723ebed93a490a6c836f | |
| parent | b830e6696627e1c740e7f93f7978c604a59ee7ac (diff) | |
MacOs compiler fix.
Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>,
Luciano Wolf <luciano.wolf@openbossa.org>
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 1 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_mac.xml | 11 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_x11.xml | 2 | ||||
| -rw-r--r-- | PySide/QtNetwork/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | libpyside/qsignal.h | 2 |
6 files changed, 22 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 73846a203..7cab44251 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,19 @@ project(pysidebindings) cmake_minimum_required(VERSION 2.6) -set(CMAKE_CXX_FLAGS_RELEASE "-Wall -DNDEBUG -Os -Wl,-O1 -Wl,--hash-style=gnu -Wno-strict-aliasing -fvisibility=hidden") +set(CMAKE_CXX_FLAGS_RELEASE "-Wall -DNDEBUG -Os -Wno-strict-aliasing -fvisibility=hidden") set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-common -Wall -fno-strict-aliasing -fvisibility=hidden") +if (CMAKE_HOST_UNIX) + if (CMAKE_HOST_APPLE) + if (NOT QT_INCLUDE_DIR) + set(QT_INCLUDE_DIR "/Library/Frameworks") + endif () + else () + set(CMAKE_CXX_FLAGS_RELEASE "$CMAKE_CXX_FLAGS_RELEASE -Wl,-O1 -Wl,--hash-style=gnu") + endif () +endif () + if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 9697e3cf8..238eea698 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -439,7 +439,6 @@ <modify-function signature="init(const QWidget*)" remove="all"/> <!--### Obsolete in 4.3--> </value-type> - <enum-type name="QPixmap::ShareMode"/> <value-type name="QStyleOptionGraphicsItem" polymorphic-id-expression="%1->type == QStyleOptionGraphicsItem::Type && %1->version == QStyleOptionGraphicsItem::Version" /> <value-type name="QStyleOptionSizeGrip" polymorphic-id-expression="%1->type == QStyleOptionSizeGrip::Type && %1->version == QStyleOptionSizeGrip::Version" /> <value-type name="QStyleOptionButton" polymorphic-id-expression="%1->type == QStyleOptionButton::Type && %1->version == QStyleOptionButton::Version" /> diff --git a/PySide/QtGui/typesystem_gui_mac.xml b/PySide/QtGui/typesystem_gui_mac.xml index a505126c7..b27df0fce 100644 --- a/PySide/QtGui/typesystem_gui_mac.xml +++ b/PySide/QtGui/typesystem_gui_mac.xml @@ -1,12 +1,13 @@ <?xml version="1.0"?> <typesystem package="PySide.QtGui"> - <rejection class="*" function-name="qt_mac_set_cursor"/> <rejection class="*" function-name="macMenu"/> - <!-- qApp macro register --> - <inject-code class="target" file="glue/qtgui_boost.cpp" position="end"/> - <inject-code class="native" file="glue/qtgui_glue.cpp" position="beginning"/> + <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" /> + <suppress-warning text="type 'QGtkStyle' is specified in typesystem, but not defined. This could potentially lead to compilation errors." /> </typesystem> diff --git a/PySide/QtGui/typesystem_gui_x11.xml b/PySide/QtGui/typesystem_gui_x11.xml index 07c9e5e30..742987430 100644 --- a/PySide/QtGui/typesystem_gui_x11.xml +++ b/PySide/QtGui/typesystem_gui_x11.xml @@ -8,5 +8,7 @@ <modify-function signature="appVisual(int)" remove="all"/> </value-type> + <enum-type name="QPixmap::ShareMode"/> + <load-typesystem name="typesystem_gui_common.xml" generate="yes"/> </typesystem> diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index a00a48bca..70b6ed870 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -92,7 +92,8 @@ set(OPENSSL_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qsslerror_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtNetwork/qsslsocket_wrapper.cpp ) -CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL ${OPENSSL_SOURCES} QtNetwork_SRC) + +CHECK_QT_NETWORK_MACRO("Network OPENSSL" QT_NO_OPENSSL OPENSSL_SOURCES QtNetwork_SRC) execute_generator(network QtNetwork_SRC "${CMAKE_CURRENT_BINARY_DIR}:${QtCore_SOURCE_DIR}") diff --git a/libpyside/qsignal.h b/libpyside/qsignal.h index 02e090be1..63eded132 100644 --- a/libpyside/qsignal.h +++ b/libpyside/qsignal.h @@ -1,4 +1,4 @@ -/* +/* * This file is part of the Shiboken Python Bindings Generator project. * * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |