From 35a5bad950bfa5082268a0f52be4d6e310678f8f Mon Sep 17 00:00:00 2001
From: Renato Filho <renato.filho@openbossa.org>
Date: Fri, 20 Aug 2010 14:43:18 -0300
Subject: Fixed typestyste to windows.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Hugo Parente Lima <hugo.pl@gmail.com>
---
 PySide/QtCore/typesystem_core.xml   | 7 ++-----
 PySide/QtGui/typesystem_gui_win.xml | 2 +-
 PySide/global.h.in                  | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 571cc913d..f1c4cf2f8 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -128,13 +128,10 @@
   <primitive-type name="signed long" default-constructor="0"/>
   <primitive-type name="long"/>
   <primitive-type name="unsigned long" default-constructor="0"/>
-  <primitive-type name="WId">
-    <!-- FIXME This is a workaround to include some headers needed by some includes (nothing to do with QBool) -->
-    <include file-name="signalmanager.h" location="global"/>
-  </primitive-type>
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyLong">
     <!-- FIXME APIExtractor or shiboken do not support multiple includes by primitive type -->
-      <include file-name="QTextDocument" location="global"/>
+    <include file-name="signalmanager.h" location="global"/>
+    <include file-name="QTextDocument" location="global"/>
   </primitive-type>
   <primitive-type name="QBool" target-lang-api-name="PyBool">
     <conversion-rule file="qbool_conversions.h"/>
diff --git a/PySide/QtGui/typesystem_gui_win.xml b/PySide/QtGui/typesystem_gui_win.xml
index 0dfb50487..f44d3d4d2 100644
--- a/PySide/QtGui/typesystem_gui_win.xml
+++ b/PySide/QtGui/typesystem_gui_win.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <typesystem package="PySide.QtGui">
   <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
-
+  <enum-type name="QPixmap::HBitmapFormat" />
   <load-typesystem name="typesystem_gui_common.xml" generate="yes"/>
 </typesystem>
diff --git a/PySide/global.h.in b/PySide/global.h.in
index c9c8ba8f2..cf21bd6cc 100644
--- a/PySide/global.h.in
+++ b/PySide/global.h.in
@@ -345,7 +345,7 @@ QT_END_HEADER
 #define QT_NO_DEBUG
 
 #include <QtCore/QtCore>
-#if @ENABLE_MAC@
+#if @ENABLE_MAC@ || @ENABLE_WIN@
   #undef qdoc
 #endif
 #include <QtGui/QtGui>
-- 
cgit v1.2.3