From bb32f636589e915811d5ad9dce598f226fa49fbf Mon Sep 17 00:00:00 2001
From: Renato Oliveira <renolive@rodrigo-oliveiras-macbook-pro-15.local>
Date: Wed, 19 May 2010 14:32:14 -0300
Subject: MacOs compiler fix.

Reviewer: Hugo Parente Lima <hugo.lima@openbossa.org>,
          Luciano Wolf <luciano.wolf@openbossa.org>
---
 PySide/QtGui/typesystem_gui_common.xml |  1 -
 PySide/QtGui/typesystem_gui_mac.xml    | 11 ++++++-----
 PySide/QtGui/typesystem_gui_x11.xml    |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'PySide/QtGui')

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-&gt;type == QStyleOptionGraphicsItem::Type &amp;&amp; %1-&gt;version == QStyleOptionGraphicsItem::Version" />
   <value-type name="QStyleOptionSizeGrip" polymorphic-id-expression="%1-&gt;type == QStyleOptionSizeGrip::Type &amp;&amp; %1-&gt;version == QStyleOptionSizeGrip::Version" />
   <value-type name="QStyleOptionButton" polymorphic-id-expression="%1-&gt;type == QStyleOptionButton::Type &amp;&amp; %1-&gt;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>
-- 
cgit v1.2.3